Merge pull request #1 from alexkalderimis/master

Bring intermine up to date with upstream
Merge pull request #2 from alexkalderimis/master

Pull in latest changes.
Merge pull request #3 from alexkalderimis/master

Pull in upstream changes
Merge branch 'master' of https://github.com/intermine/imjs
Added missing grunt call