Merge pull request #225 from frankel/master

config/*.yml should not be ignored in Rails

Rails.gitignore

@@ -12,6 +12,5 @@ capybara-*.html
 /coverage/
 /spec/tmp/*
 **.orig
-config/*.yml
 rerun.txt
 pickle-email-*.html