Update to include axis offsets
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git
Added a Smooth Gold edge function for use with the ARPES calibration 
process
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git