Add undo-tree
Add pop-to-mark-command keybind