Add a Vim-like jumplist and remove unneeded hacks