Switch from autojump to rupa/z and include it as a submodule