Add a top level watermeter page.
Rename watermeter to perfbar in preparation for more items.
Merge branch 'master' into tomk-watermeter
Another round of API URL and UI tweaks.