Merge changes from dev onto master branch

We've updated to InterMine 1.3.3, re-added /synbiomine. But Mike has been working on the dev branch so we want to port all the changes from "dev" to "master". We know there might be some merge issues when we upgrade again but we'll work on lowering the differences in the intermine core code gradually. Ideally we would have none.