Updating to new Emacs 24 configuration files.
Added Rainbow-delimiters to Scala-mode.
Merge remote-tracking branch 'origin/master'