Add melpa repo
Merge branch 'master' of github.com:wtfleming/dotfiles
Change paren-mode settings