Update README.md and few tweaks
Merge branch 'master' of github.com:asphxia/vimrc

Conflicts:
	README.md