Merge pull request #77 from jasnow/master

Upgraded 6+4 gems and then rebuilt Gemfile.lock file
Rebuilt Gemfile.lock file