Small fixes
Merge branch 'develop' of github.com:panoptes/POCS into develop

Conflicts:
	panoptes/state/states/shutdown.py