Cleaning up for merge.

alarmdecoder/decoder.py

@@ -262,7 +262,6 @@ class AlarmDecoder(object):
         :param no_reader_thread: Specifies whether or not the automatic reader
                                  thread should be started.
         :type no_reader_thread: bool
-
         """
         self._wire_events()
         try:

test/test_devices.py

@@ -1,6 +1,11 @@
 from unittest import TestCase
 from mock import Mock, MagicMock, patch
 from serial import Serial, SerialException
+try:
+    from pyftdi.pyftdi.ftdi import Ftdi, FtdiError
+except:
+    from pyftdi.ftdi import Ftdi, FtdiError
+from usb.core import USBError, Device as USBCoreDevice
 import sys
 import socket
 import time