Tidy
Merge branch 'develop' of github.com:panoptes/POCS into develop
Removing old tests to add new