Switch to using tarball
Update to use our own branch