misc changes
Merge branch 'master' of https://github.com/rynclark/pretty-time
misc changes