Removed duplicates in bib database.
Merged biblography databases.
Merged in the proposal, and moved some parts around.