Emoncmsorg

ready for master branch