Minor cleanup suggested in PR #235
Fix non-deterministic sorting of bundles
Merge pull request #241 from dimagi/cleanup

Cleanup