Merge pull request #271 from jasnow/master

Upgraded 2 gems by rebuilding Gemfile.lock file