Final touches for separation of config
Merge branch 'heroku'
fixing conflicts with github