Fix name of supervisord.conf dest file
Make supervisord.conf into template
Use environment variables for db connect
Remove fabfile from tracking (contains security info)
Add secured fabfile
merge pull request

* webapp4:
  Add secured fabfile
  Remove fabfile from tracking (contains security info)
  Use environment variables for db connect
  Make supervisord.conf into template
  Fix name of supervisord.conf dest file
Fix fabfile after merge
Merge conflicts manually