Get rid of commented out stuff
Merge branch 'master' of github.com:poeks/timey