Update config files for Rails 4 with "rake rails:update"
Add .keep files included in new Rails 4 apps
Update config files based on the results of "rails new codeflash"
Merge
Merge branch 'dev' into feature/config-updates
Merge branch 'dev' into feature/config-updates
Merge pull request #210 from codeflash/feature/config-updates

Update config files for Rails 4 with "rake rails:update"