Don't manually set SetupOwnerId. Let's see how many tests fail. Eventually we want to do this, since we want to use getInstance, which already populates that field.
Merge branch 'feature/883-hierarchical-custom-settings-2' of https://github.com/SalesforceFoundation/Cumulus into feature/883-hierarchical-custom-settings-2