Make bib file a bit more uniform

There are still many improvements we could make on the bib file,
but it is more important to actually have these references
somewhat correctly, than spending oodles of time on getting
everything exactly right.