Set comment string to #%s

This allows the TPope's vim-commentary plugin to work with .snippet
files; e.g. typing "\\\" will comment out the current line with "# ".
Improvements to JS snippets by tom cammann
Correct commentstring for snippet files by Mike Morearty
more snips
Merge remote-tracking branch 'origin/master'

Conflicts:
	UltiSnips/java.snippets
Updated java snippets, added junit setting