.
Merge branch 'master' of https://github.com/icrashcode/dotfiles

Signed-off-by: Chad Jones <chad@crashcode.org>

Conflicts:
	vimrc
	zshrc