Update gitignore
Merge branch 'master' of github.com:jonasac/.emacs.d