Merge pull request #186 from CrowdFlower/update_gemfile

Update Gemfile
Merge remote-tracking branch 'refs/remotes/rails/3-0-stable' into 3-0-stable