Use 2 spaces for js
Merge branch 'master' of github.com:richleland/vim

Conflicts:
	vimrc