Add paren highlighting in programming modes
Merge emacs
Merge branch 'master' of github.com:ebanner/dotfiles

Conflicts:
	emacs