[rcthompson]

Zotero, the reference manager, is actually a good way to store website snapshots. It has one-click-to-save browser extensions, and it generally saves a snapshot of the web page along with any other saving method (e.g. downloading the PDF if you're on a page associated with a scientific article). It also saves the source URL as well. Now that I think about it, it might actually make a decent bookmark manager.

[I_complete_me]

I have started to use Zotero for managing bookmarks. It works quite well - maybe even very well. Also, I can back up to .csv (among other formats) and always have my links. Only downside is to remember to have Zotero up and running - it's similar to needing a local server in that respect.