Fixed the build, and prepped the 2.0 release.