WIP
Merge branch 'master' of github.com:346/dotfiles

Conflicts:
	.vimrc
Merge branch 'master' of github.com:346/dotfiles

Conflicts:
	.vimrc