Markup and typo fixes
Cleanup formatting of example manifest

Make it more readable and easier to highlight the important parts for
the purposes of presenting lots of text on a big wall far away.
Tools (e.g.  Maven) do produce slightly different output, but we
just don't care here.
Updated the slide
Merge remote-tracking branch 'sop/master'

Conflicts:
	gerrit-api-econ2014.slide