vim-watchdogs
Merge branch 'master' into laziness

Conflicts:
	.vimrc
merge master : vim-watchdogs (and +lazy)