fortune(6): Merges, cleanup, fixes, general improvements

in the repo mentioned below, you'll find a couple of commits to fortune, that
fix *many* typos and improve style. They also weed out dozens of duplicate (or
triplicate?) fortunes. Finally, fortunes2 (and -o) is merged into fortunes (and
-o), as has been done in FreeBSD.

No fortunes were removed or added, but a lot more now show up per default, due
to the merge.

Please keep this in at least two commits, so merge history makes more sense.
thx!