Move NoCoffee link to the right section; content fixes/placeholders
Content updates
Content updates
Content updates
More images
Content updates
Merge branch 'master' into gh-pages