Update watermark module to remove unneeded table (and upgrade to v3).
Trim some no-longer-needed @todo notes in various places.
Merge pull request #414 from shadlaws/fixes_20130616_2

Fixes 20130616 2