update committer identity, remove columbia cruft
Merge branch 'master' of github.com:chazy/zsh-config

Conflicts:
	zshrc