Merge pull request #225 from frankel/master

config/*.yml should not be ignored in Rails