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

Conflicts:
	.gitignore
	_vim/.netrwhist
	_zshrc
	install.sh
Merge branch 'master' of github.com:johnnadratowski/dotfiles