Fix address bug, disable return_to_local for now

camrasdevices.py

@@ -104,11 +104,11 @@ class CamrasHpibDevice(object):
             str: output of the command (in case it was a query)
         """
         if prepend_address:
-            address = self.address
+            address = self.hpib_address
         else:
             address = None
 
-        return CamrasHpibDevice.command_thread.protocol.command(command_string, address,
+        return CamrasHpibDevice.command_thread.protocol.command(command_string, address=address,
                                                                 return_to_local=self.return_to_local)
 
     @property
@@ -161,7 +161,7 @@ class LocalOscillator(CamrasHpibDevice):
     """Wrapper around HPIB commands for the local oscillator"""
 
     def __init__(self, **kwargs):
-        super(LocalOscillator, self).__init__(28, return_to_local=True)
+        super(LocalOscillator, self).__init__(28)
 
 
 class ClockGenerator(CamrasHpibDevice):