mostly magnet stuff - JULIA
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	lib/fitting/dark_esr_auto_analysis.py
	scripts/espin/dark_esr_analysis.py