Added update_data parameter to govern whether to override data in
already in the database

This is set to NO by default
Merge branch 'david'