Fix a minor warning from FML
Bump forge
Import cleanup
Reinstate the @Mod rather than our ModContainer

Fixes #25