I've been fuddling around with
Zotero and a basic .bib file, but I think I found something more awesome:
Mendeley. I found it looking for a PDF annotator, and it looks fantastic! I'll update later after I've used it a while. It even syncs with Zotero and can watch a folder for new PDFs.