Small changes to get running with new python acquire
Merge remote-tracking branch 'origin/saxswaxs' into saxswaxs

Conflicts:
	scatterbrain__define.pro