Non root2

This revamps the deploy scripts and fixes a few deploy bugs for prod.