Reordered sections a bit. Still heavily work-in-progress.
Merge branch 'master' of github.com:plone/mockup