Merge in changes from patch-request https://github.com/emoncms/emoncms/pull/125
(I plan to add a rain-gauge myself in the near future, so this will be useful then.)