Fix vimperator, though it's still ugly and local-repo based