Merge pull request #262 from jasnow/master

Upgraded 2 gems by rebuilding Gemfile.lock file
Upgraded gems by rebuilding Gemfile.lock file