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

Conflicts:
	_vimrc