rm TODO
cmd and roles refactor
Merge branch 'master' of github.com:sunlightlabs/cheerwine