Fixes
Merge branch 'master' of https://github.com/svermeulen/vimconfig

Conflicts:
	_vimrc
	vim_todo.txt