Conversion to work with development branch emoncms
Merge pull request #6 from emoncms/dev

make master