adjusted imports to merged laser timing file

slic/devices/general/__init__.py

@@ -1,5 +1,4 @@
 
-from . import alvra_timing
 from . import motor
 from . import smaract
 from . import delay_stage

slic/devices/loptics/alvra_experiment.py

@@ -4,7 +4,7 @@ from slic.utils.printing import printable_dict
 from slic.devices.general.motor import Motor
 from ..basedevice import BaseDevice
 from ..general.delay_stage import DelayStage
-from ..timing.alvralasertiming import eTiming
+from ..timing.lasertiming import eTiming
 
 
 class LaserExp(BaseDevice):