code cleanup (no functional changes)

batcave.py

@@ -10,7 +10,7 @@ import time
 import threading
 
 from ffstatus import \
-    dict_merge, merge_alfred_batman, \
+    merge_alfred_batman, \
     ApiServer, \
     AlfredParser, BatmanParser, \
     DashingClient, GraphitePush, \

ffstatus/__init__.py

@@ -24,9 +24,11 @@ __all__ = [
 
 logger = logging.getLogger('ffstatus')
 
+
 def mac2id(mac):
     return mac.lower().replace(':', '')
 
+
 def dict_merge(a, b):
     '''recursively merges dict's. not just simple a['key'] = b['key'], if
     both a and bhave a key who's value is a dict then dict_merge is called
@@ -43,6 +45,7 @@ def dict_merge(a, b):
             result[k] = deepcopy(v)
     return result
 
+
 def merge_alfred_batman(alfreddata, batmandata):
     merged = {}