Merge pull request #298 from jasnow/master

Rebuilt Gemfile.lock file