Delete contrib suggestion, as the best format is still up in the air.
Merge branch 'master' into gh-pages
Rebuild docs