Some work over the past few days (can't write a proper commit log, forgot what i did)
Merge branch 'master' of https://github.com/ForgeEssentials/ForgeEssentialsMain.git