added js 2 space tab support
Merge branch 'master' of https://github.com/stoneG/vim

Conflicts:
	.vimrc