Start prepping for actual merging and loading
Skeleton comments for file loading
Get past first failing test with new code
Remove now-useless debug line which was buggy
Don't bother being idempotent for shell/collection loading, sheesh.

Neither operation is expensive and it would be a crummy API for anybody trying
to reuse this.
Load collection data. lol?
Don't need this sucker anymore
Get env loading basically working again
More work towards file loading
Try normalizing things a bit