minor modifications to delaygenerator, bug fixes in scan widgets
Merge branch 'master' of https://github.com/stevens4/sitzlabexpcontrol

Conflicts:
	scan/input.py
	scan/widget.py