Merge branch 'master' of git://git.bitwiz.org.uk/crystfel into scaling

Conflicts:
	scripts/plot-cc-and-scale.R
	src/check_hkl.c
	src/process_hkl.c