Cleanup.
Explicitly load sr-speedbar.
Merge branch 'master' of github.com:tomterl/emacs.d