Recent changes.
Merge branch 'master' of https://github.com/ChrisWeiss/.dotfiles

Conflicts:
	.zshrc