Merge pull request #23 from fs/update-gems

Update gems
Merge branch 'master' into move-scripts-to-bin

* master: