[#638] Clean up some imports and remove OrderedDict redefine
[#638] Use correct function
[#638] PEP8
Merge remote-tracking branch 'origin/master' into 638-code-clean
Merge pull request #638 from okfn/638-code-clean

Minor code clean OrderedDict