Zotero is great, but the current versions don't actually support web annotation. That's a shame not only because web annotation is useful, but because given its excellent support for PDF annotation, it feels like it could become a one-stop shop for annotation/organisation of documents of all kinds, something which I've been looking for in vain for some time.