Make combine_things test function deterministic
Merge branch 'master' into development
Merge branch 'development' of github.com:johnwlockwood/karl_data into development