Merge branch 'master' of github.com:colons/dotfiles

Conflicts:
	.zshrc