Changed things around to work with intermine.Query objects.
Merge branch 'master' into gh-pages