Merge lp://staging/~jtv/maas-test/housekeeping into lp://staging/maas-test

Fix lint, update manpage.

Fixes several problems at once. Our generated manpage was out of date; we had lint in the code so a plain “make” or “make lint” would break; and due perhaps to some change in tooling the manpage no longer compiled from RST. The RST source for the manpage also had an extraneous heading accidentally inserted in it.

I didn't want to spend the time re-tweaking the levels of the section headings, which have to work right in both the man page and the HTML output; the change doesn't look too bad to me.

We have more problems: “make test” no longer works for me in a clean copy of trunk. But let's not get too much into one branch — this brings us some fixes now, and at least a plain “make” works again.

Jeroen