small script adjustments
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	lib/magnetometry/adaptive_magnetometry.py
	scripts/magnetometry/generate_adaptive_table.py
merged