Merge branch 'master' of github.com:jbbrokaw/piktio into deployment
Adds supervisord to deployment
Merge pull request #9 from jbbrokaw/deployment

Deployment