deleted .emacs.d/history
Merge branch 'master' of github.com:vios-fish/dotfiles