Merge pull request #820 from mcmonkey4eva/master

Pull request for various things
Merge branch 'master' of https://github.com/aufdemrand/Denizen