Merge branch 'master' of github.com:iblamefish/dotVim

* 'master' of github.com:iblamefish/dotVim:
  better JS syntax and linting
  reintroduce plugins (typo in repo name before)
  ignore bundle directory - all plugins installed with Vundle now
  switch pathogen to vundle
add rainbow parens
Merge branch 'master' into ycm

* master:
  add rainbow parens

Conflicts:
	vimrc