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