2.0

## DO NO MERGE

This is the unstable 2.0 branch of distributions.  See README.md for details.