Add some gems from here and there

Thanks @Thoughtbot
Merge branch 'refs/heads/master' into gh-pages