Clean up 2.0

Pushing changes upstream from 1.0.x, and replacing images that are for the project, not product.