clean up vimrc
Merge branch 'master' of https://github.com/gilligan/.vim

* 'master' of https://github.com/gilligan/.vim:
  add jsdoc plugin

Conflicts:
	vimrc