next gen emacs, cause I\'m stupid
Merge branch 'master' of https://github.com/Errorific/dotfiles