too many updates
Merge branch 'master' of github.com:jamesob/dotfiles

Conflicts:
	install.sh
	vim/.netrwhist
	vimrc
	zshrc