Add node js support for vim
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vundle.vim