going further with puppet
problems with superivsor
removing broken submodule
working supervisor stuff
mfold puppet
Merge branch 'master' of github.com:Nozdi/shmir into puppet

Conflicts:
	shmir_api/src/shmir_api/settings.py
ignoring build
preventing app crash
Merge pull request #57 from Nozdi/puppet

Puppet