Upgraded to Ruby 2.1.5; Rebuilt Gemfile.lock file
More work at upgrading to Ruby 2.1.5
Merge pull request #643 from jasnow/master

Upgraded to Ruby 2.1.5; Rebuilt Gemfile.lock file