Merge pull request #824 from Morphan1/master

Some more stuff
Fix merge issues

remove duplicate getLongFrom
Merge branch 'master' of https://github.com/aufdemrand/Denizen