I'd recommend moving to stash as well. There is a lot of development going into it. https://github.com/ywangd/stash