Fixing the upsert
Merge branch 'develop' of github.com:panoptes/POCS into develop

Conflicts:
	scripts/serial_read.py