Working better on windows, indenting for javascript.
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc
Merge remote-tracking branch 'origin/master'
syntax highlighting for groovy