Lots of stuff
Merge branch 'master' of https://github.com/danielhogan/Timeclock.git
Pulled from github