Trimmed some calibrant rings to speed up fitting
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git
Added more trial fit functions with some refactoring