smoke-parrots: more info, less noise
Merge branch 'master' of github.com:rurban/home-bin

Conflicts:
	smoke-parrots