Solarized theme (in progress)
C-x C-b uses ibuffer
Fix error with emacs 24.4
Merge remote-tracking branch 'upstream/master'