vim: add vim-capslock plugin
Merge branch 'master'

Conflicts:
	.gitmodules