More cleanup, upgrade stuff, deploy to cloudbees