Ancient local changes.
Merge branch 'master' of github.com:misanthropicgeek/dotfiles

Conflicts:
	zshrc