Add support for tox (http://tox.testrun.org/)
Fix a few test failures

caused by assumptions about non-deterministic things like in what order
keys in a dict will be serialized to JSON
Merge pull request #896 from msabramo/fix_test_failures

Fix test failures