checkstyle
refs #452
Merge pull request #677 from intermine/i452

Don't run extra queries when running LOOKUP queries with wildcards
checkstyle
fix regular expression. Refs #692
Merge pull request #697 from intermine/uniprot-feature

Uniprot feature - parse config correctly
Don't run abstract tests. Also, no real type aliases => sadface
rename class so ant doesn't try and run it
Added class-keys type, to prevent errors
Merge branch 'beta' of github.com:intermine/intermine into oauth2-for-beta