I am currently evaluating worldbrains memex for firefox. It let's you full text search your visited sites the results can also be included in a google search via the plugin. Sites can be annotated, tagged.