Cleanup and performance improvements
Merge branch 'master' of github.com:aufdemrand/Denizen