working changes.
Merge branch 'master' of github.com:wpfff/diamond-analysis

Conflicts:
	scripts/teleportation/dark_esr_analysis.py
addition of cr analysis to sequence analysis lib
previous changes to analysis from pfaff
Merge branch 'master' of github.com:wpfff/diamond-analysis

Conflicts:
	scripts/teleportation/calibrate_pipulse.py
	scripts/teleportation/dark_esr_analysis.py
	scripts/teleportation/laser_scan.py
	scripts/teleportation/mbi_dark_esr_analysis.py
	scripts/teleportation/mbi_electron_rabi_analysis.py
	scripts/teleportation/mbi_photon_ratio.py