Raised useful things to superclass
Merge branch 'emma' of github.com:intermine/intermine into emma

Conflicts:
	testmodel/webapp/selenium/test/browsertestcase.py
Merge branch 'emma' of github.com:intermine/intermine into emma
Skip openid