Fix indentation after single-line /** comments */
Use non-greedy operators for stripping out quoted contents of lines
Merge branch 'multi_string_literals'

Conflicts:
	indent/scala.vim
	indent/testfile.scala
Fix indentation when virtualedit is off
Merge branch 'virtual_edit_off'