Quite a bit of cleanup and refactoring
Merge branch 'rollback'

Conflicts:
	garment/deploy.py
	garment/release.py