2.0.0

Most of this has been previously vetted, but this is the all inclusive 2.0.0 PR.

@weilu did we want to split it up into smaller PR's for simpler review over the next few days?