Latest
Merge branch 'master' of https://github.com/emiel/dotvim

Conflicts:
	vimrc
My prefs
Latest
Latest
Merge branch 'master' of https://github.com/emiel/dotvim

Conflicts:
	vimrc