Remove the Gemfile.lock from the gitignore and commit it

Gemfile.lock files are important for managing precise dependency versions for
Ruby applications that are meant to be deployed. As a result, Rails apps should
have their Gemfile.lock files committed to prevent surprises in production
environments.
Merge branch 'master' into rails-4
Add the results of "bundle update"