first pass on new collections
Merge branch 'master' of ssh://github.com/apblack/minigrace
Pulling in Jameson's changes?  How can I see why this is necessary?