initial conf
example prod settings added
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'heroku'