Merge in upstream

Trying out doing all of this in GitHub.

Anyways, this is mainly so we no longer use the deprecated Deployments API and such.