fixincludes templates cleanup

[Bruce Korb]

> [[...]] Here is a revised patch which
> leaves the FIXIDX stuff in place and adds a comment explaining what
> it's there for.
>
> I also fixed a bug in the previous version of the patch for FreeBSD -
> got a bit too eager with the delete key.

It looks good.  I should point out that I have
only eyeballed it.  My play time is a bit more
constrained than it has been in the past....

Regards,
	Bruce