Merge pull request #811 from mcmonkey4eva/master

Pull request for various additions and changes
Merge pull request #813 from mcmonkey4eva/master

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