Changes to work with emoncms development branch