cleaning up stuff I don't even think I used
Merge branch 'master' of github.com:imwally/Dotfiles

Conflicts:
	zshrc