Merge branch 'develop'
Adding camera file
Initial commit of Observatory.py
Merge branch 'master' of git://github.com/panoptes/POCS
Merge branch 'develop' of https://github.com/panoptes/POCS into develop