Upgraded Ruby to 2.1.4; Rebuilt Gemfile.lock file
Merge pull request #640 from jasnow/master

Upgraded Ruby to 2.1.4 and upgraded 1 gem.