Fix a couple of elisp warnings.  Thanks Flycheck.
Merge branch 'master' of github.com:tobytripp/emacs.d
Cleanup some redundant keybindings