Clean up collection creation for self-deposit contributions
closes #179
Clean up self-deposit collection specs
Merge branch 'self_deposit_collections' into v3.0pre1