Merge pull request #488 from jasnow/master

Rebuilt Gemfile.lock file
fix placeholder typo
Merge pull request #491 from gregmolnar/typo

fix placeholder typo