fix warning for extrawhitespace in brendan.vimrc
Brendan .vimrc updates y'all
Highlight trailing whitespace for max.vimrc.
Added syntax highlighting for Scala
Merge remote-tracking branch 'upstream/master'

Get back in sync with Wistia's updates