modify vimrc
Merge branch 'master' of github.com:taoyag/config

Conflicts:
	vim/.vim-new/neobundle.vim.git