Fix bugs so jobs now submit correctly to cluster
Merge branch 'master' of github.com:EddyLarkin/warwickEmEnergy