Scala mode: cleanup and fix indentation.

Also add a few simple highlighting enhancements.
Scala mode enhancements.

- s, f and raw string interpolators
- XML highlighting

Note XML highlighting cannot (at least in any way I can figure out)
properly parse attributes.