ignore desktop
Merge branch 'master' of github.com:nhoffman/.emacs.d