updated .vimrc
Merge branch 'master' of https://github.com/khairihafsham/vim

Conflicts:
	.vimrc