updating for Collective Ray's environment
Merge branch 'master' of github.com:collectiveray/PunchClock