Merge pull request #639 from jasnow/master

Changed Time.now to Time.zone.now and rebuilt Gemfile.lock file
Upgraded Ruby to 2.1.4; Rebuilt Gemfile.lock file