Reset a couple key bindings.
Merge branch 'master' of github.com:tobytripp/emacs.d