updated
Merge branch 'master' of github.com:doloopwhile/dotfiles
Merge branch 'master' of github.com:doloopwhile/dotfiles

Conflicts:
	_vimrc
updated
updated
merged