Merge pull request #1002 from MrConcept/master

Merge Master
clean up of preen_cron, which I'm re-enstating
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
add ability to restore lost streaks, also add int() view helper
function (pretty cool actually, https://groups.google.com/forum/?fromgroups#!topic/derbyjs/otFCLu2p7yY)