Merge pull request #596 from jasnow/master

Upgraded 6 gems by rebuilding Gemfile.lock file
Merge branch 'master' of https://github.com/andrew/24pullrequests