I've been playing quite a lot with the NSA codebase this past year, and I've spent some time making comparisons between the NoScript release branch and I've spent some time patching the NSA++ codebase.
It's a bit messy and vague at the moment. I'm going to be making incremental commits on github when I have time, but I'm calling for other developers who enjoy merging code

All the best,
Pete