Gracefully deal with merging items with themselves
Fix XSS vulns in the forms
Add doc section about testing and known flaws
All around doc improvements, part 1