Merge pull request #79 from zakv/fix-78

Fix #78: labscript.py accidentally overwrites dedent()

Author: zakv

labscript/labscript.py

@@ -39,11 +39,11 @@
 # other code is using:
 import qtutils
 
+from pylab import *
+
 from labscript_utils import dedent
 from labscript_utils.properties import set_attributes
 
-from pylab import *
-
 import labscript.functions as functions
 try:
     from labscript_utils.unitconversions import *