Updated git ignore file, per https://github.com/rails/rails/pull/4057
Merge remote-tracking branch 'upstream/master'