Clear shell
Merge branch 'master' of github.com:antonj/.emacs.d