Touch-ups
Merge branch 'master' of bitbucket.org:dpflug/dotfiles
Merging Xresources
emacs: show-paren-mode