Deterministic bundle ordering

Resolves #33 

Also closes #44, #45