Merge pull request #210 from codeflash/feature/config-updates

Update config files for Rails 4 with "rake rails:update"
Merge branch 'dev' into feature/refactoring-updates