Added plugin includes
More sensible (and non-conflicting names) for fields
Added backwards compatibility hack.
Lowered log level
Merge branch 'dev' of github.com:intermine/intermine into dev