mostly fixing pretty time stuff
Merge branch 'master' of github.com:sheffgeeks/burritobot