Increased number of searches in ellipse finder
Fix to http://jira.diamond.ac.uk/browse/SCI-1623
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git
Cleaned up imports on new loader.