removed undo-tree
Merge branch 'master' of https://github.com/hansogj/.emacs.d