Hilight matching parens, no trailing spaces on save.
Merge branch 'master' of github.com:aroemers/.emacs.d