Merged my offline changes to support a BibTeX search path and additional citation/reference types.
Added to-do list.