Added things
Added the other things
Merge branch 'master' of github.com:anoxic/dotfiles

Conflicts:
	zshrc