Fixed some misc. bugs, worked on WC
Merge branch 'master' of git://github.com/ForgeEssentials/ForgeEssentialsMain