Combat and Weapon changes

Plus a minor addition to .gitignore.
EPUB Metadata

I had hoped this would fix the glaring erroneous Untitled heading to the
navigation pages in the EPUB output, but it doesn't. I'm keeping it
anyway, since the data is important and may actually appear somewhere in
the EPUB output.