update meniscus to new package layout and portal version
Merge branch 'master' of github.com:ProjectMeniscus/meniscus
Merge branch 'master' of github.com:ProjectMeniscus/meniscus
fixing a minor merge conflict
Merge pull request #455 from zinic/master

ZMQ Changes