Used varargs because am lazy.
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git
Moved code from diamond-jython plugin to its own plugin
Updated to MG's changes in old location
Updated to use new Jython plugin