Remove deprecated defaults.
Replace 3rd party ordered dict with collections.OrderedDict
Merge branch 'master' of github.com:visgence/portcullis