Add js indent plugin
Merge branch 'master' of github.com:jayKayEss/vimrc

Conflicts:
	.vimrc