Update a bunch of gems.
Merge branch 'refs/heads/github.master' into github.factory_girl