Build & deployment improvements

Initial attempt at rollback