NSA Accountability Act as a Diff

The idea is good, but in regards to Patriot Act and the FISA Amendments ACT, they need to be repealed in full, and start from scratch based on a real debate this time, and with laws not passed right before Christmas.