Updated vimrc
Merge branch 'master' of github.com:quynguyen/vim-config

Conflicts:
	vimrc