Merge branch 'master' into senslab2

diff --cc sfa/client/sfi.py
Simple merge

diff --cc sfa/plc/plslices.py
index ae9a079,6f2c57e..4a88e22
--- 1/sfa/plc/plslices.py
--- 2/sfa/plc/plslices.py
+++ b/sfa/plc/plslices.py
@@@ -138,9 -137,9 +138,9 @@@ class PlSlices
  
          # get this site's authority (sfa root authority or sub authority)
          site_authority = get_authority(slice_authority).lower()
 -
 +        print>>sys.stderr, " \r\n \r\n \tplslices.py get_peer slice_authority  %s site_authority %s" %(slice_authority,site_authority) 
          # check if we are already peered with this site_authority, if so
-         peers = self.driver.GetPeers({}, ['peer_id', 'peername', 'shortname', 'hrn_root'])
+         peers = self.driver.shell.GetPeers({}, ['peer_id', 'peername', 'shortname', 'hrn_root'])
          for peer_record in peers:
              names = [name.lower() for name in peer_record.values() if isinstance(name, StringTypes)]
              if site_authority in names: