tweekz
Merge branch 'master' of github.com:mshade/dotfiles

Conflicts:
	bin/mkterms.sh