Adding a collection_type field to collections

Posting here for visibility. Feedback appreciated (please add it to the issue).