+1 on keepass. I used passwordsafe in the past, and it worked fine but was windows only. Now use Keepass on Windows, Linux, and even have my passwords on my mobile phone with me. Even started using it at work to store all company passwords.
FISA amendments act of 2008 granting retroactive immunity to the telecoms also violates US Constitution Article 1 Section 9 "No Bill of Attainder or ex post facto Law shall be passed."
I think the ACLU has a good case and I'll be watching it closely.