Some styling changes
Merge branch 'master' of bitbucket.org:wbrick/emacs-config
Some new keybindings and snippets
Merge branch 'master' of https://github.com/wbbrick/.emacs.d