Cleanup and update
Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty