checkstyle fixes
Merge branch 'emma' of github.com:intermine/intermine into emma
checkstyle
test fix, checkstyle, eclipse warnings
gff source now creating synonyms
Merge branch 'emma' of github.com:intermine/intermine into emma
Warnings and clean up