Merge pull request #184 from mbucknell/NAWQAAN-209

Nawqaan 209
Added new content pages. The contents are generated using RSS feeds
Updated the navigation menu items to navigate to the new content pages.
Merge pull request #187 from mbucknell/NAWQAAN-223

Nawqaan 223
Updated link name to Water Watch. Also decided to chain together the
definitions and siteinfo promises to make the code a little clearer.