Resolves github issue 16

https://github.com/SalesforceFoundation/Contacts_and_Organizations/issues/16
Moved master update to allow merge of unique fields 

https://github.com/SalesforceFoundation/Contacts_and_Organizations/issues/13