Fixed record updating
Fixed records not updating as expect using upsert rather than save!  Shouldn't have been necessary.

Merge branch 'scoop-develop'