update .vimrc & README
Merge branch 'master' of github.com:bluth653426595/.vim

Conflicts:
	README.md