vim tweaks
Merge branch 'master' of https://github.com/LkeMitchll/Dotfiles

Conflicts:
	.vimrc.local