Minor modifications.
Merge branch 'master' of https://github.com/yells/configs

Conflicts:
	.zshrc