Don't worry, I fixed it!

Had to roll back to October to diagnose a weird runtime error.
Everything's fixed, and everything done in the last few months is all
together in this commit. Includes all components of the PvP health
update.