octopi-git: Prep. for upstreaming (WIP)