Build & deployment improvements

Still working on getting activate working
Build & deployment improvements

Fixed bug in deployment id calculation
More work on getting activate closer to "right"