update to latest upstream, changed how we build and define version