Merged in changes from the bibliography.

Benjamin Mako Hill || Want to submit a patch?