closes #3
Merge branch 'master' of github.com:intermine/intermine-accordb

Conflicts:
	server.coffee