Merge branch 'master' into feature/cluster_f

Author: neuromusic

visual_behavior/devices.py

@@ -46,6 +46,7 @@
     'W7DT2PNC1STIM': '2P6',
     'W7DTMJ234MG': 'peterl_2p',
     'W7DT2P3STiM': '2P3',
+    'W10DTSM118296': 'NP3',
     'localhost': 'localhost'
 }