#200

When index.php outputs JSON encoded data, the content type is set to to
'application/json’.
To correct wrong kwhd figure being displayed

See http://openenergymonitor.org/emon/node/4887#comment-21165
Merge pull request #202 from Paul-Reed/patch-4

To correct wrong kwhd figure being displayed
Merge pull request #201 from kanflo/master

#200
Merge pull request #3 from emoncms/master

update from upstream