swap neocomplcache for ycm
Merge branch 'vundle' into ycm
Merge branch 'master' into ycm
add in JS completion to YCM
remove neocomplcache fluff from vimrc
Merge commit 'f30719' into ycm

* commit 'f30719':
  leave paste mode when inserting normal mode

Conflicts:
	vimrc
Merge branch 'master' into ycm

* master:
  add rainbow parens

Conflicts:
	vimrc
Merge branch 'completion-merge' into ycm