Updated for 1.5
Merge branch 'master' of https://github.com/aufdemrand/Denizen