move from supervisord to upstart for gunicorn
be less desructive in chef
Merge branch 'master' into deployed-2014