vim updates for linux
Merge branch 'master' of github.com:gmoothart/settings

Conflicts:
	.vimrc
removed dos endings from .gitconfig