Fix various BibTex styling problems.
Need to get out of the BibTeX formatting game as quickly as possible this is a loosing battle, but until then plugging holes in the ship.
Grunting at the scripts.
Merge latest next-stable.