Fixed some bugs in the conversion process.
Removed unnecessary comment markers.
Fixed bibentry loading into master.