all
Merge branch 'master' of https://github.com/august-zou/my_vimrc

Conflicts:
	.netrwhist
add vim-js