Fix cl-block-wrapper 24.3 madness.
Merge branch 'master' of github.com:sandinmyjoints/.emacs.d