Developing docs
Merge branch 'master' into cpdocs

Synch with updates on the gh-pages and master which was merged together.
Remove whitespace