More cleanup of SamplingFeatures & other diagrams

Cleaned up old comments, and provided links to some CVs using Google
short URLs (http://goo.gl/) to our Google Drive docs.