added .vim dir
Merge branch 'master' of github.com:shoemonkey/saltstate

Conflicts:
	vim/init.sls