Better syntax highlighting for Scala, minor gitconfig change