Adding docs; removing ZMQ for now; fixing json key collisions
Merge branch 'develop' of github.com:panoptes/POCS into develop
Testing adming
Updates to some of the web admin interface