updated bib and macros
Merge branch 'master' of https://github.com/uclmr/bibtex