merged in bibliography changes from master, and formatting changes to
fit on two pages
updates to bring the 2-page resume form in line with the latest cv
major revision of the 2-page resume format