Changes to work with emoncms development branch
Merge pull request #1 from TrystanLea/master

Conversion to work with latest emoncms dev branch