removed settings example, kept settings file to use with heroku environ var for sensitive info
Merge branch 'deploy'