Make Scala colors more consistent

As explained in the comments of 1cbfb91, I think this improves the coloring for Scala.  I think consistency with Java does Scala a disservice, both because the Solarized coloring for Java is less expressive than that for Ruby (from which the original Scala coloring was derived) and because Scala has more expressiveness than Java to...express in Solarized (the relative importance of keywords and type information are potentially a bit different in Java and Scala, for example).

The extra commits in here are simply because I had committed JSP coloring before it was added to upstream and forgotten to submit a pull request.  My merge just took everything in upstream and threw away my branch changes.

Thanks!