Added stuff from the global vim config to fix a lot of issues
Merge branch 'master' into ycm

Conflicts:
	vimrc