cb
cleanup crap
Merge branch 'master' of https://github.com/jasalt/konffit

Conflicts:
	shell-common.sh