Log Message:
Rototill comments and rearrange option lines

This commit has no functional changes.

Drop comments about wip/trac, www/ja-trac and eventual merging,
because that's happened.  Adjust explanation of why there is no svn or
git dependency.

Move option declaration near option use, in preparation for
options.mk.