Updated app to use the Rails 4.1 secrets.yml file setup
Updated to use Spring
updated database config
merging updates for heroku from branch