changed configuration for different envs
Merge branch 'master' into heroku
removed old config file
removing files
removing files