Updated link name to Water Watch. Also decided to chain together the
definitions and siteinfo promises to make the code a little clearer.
Merge pull request #189 from mbucknell/NAWQAAN-209

Updated link name to Water Watch. Also decided to chain together the