Bibliography now uses BibTex
Merged Biblio changes