add vim-gnupg submodule
submodule updates
add salt-vim submodule & submodule updates
vimrc: add yaml indentation settings
Merge remote-tracking branch 'origin/master' into air

Conflicts:
	.gitmodules