Changed Time.now to Time.zone.now; Rebuilt Gemfile.lock file
Merge branch 'master' of https://github.com/andrew/24pullrequests
Merge pull request #639 from jasnow/master

Changed Time.now to Time.zone.now and rebuilt Gemfile.lock file