tweaked for arch
Merge branch 'master' of github.com:bnwasteland/dotfiles

Conflicts:
	zshrc.linkme.