hydrargyrum authored Jan 24, 2017 and Romain Bignon committed Jan 25, 2017

Since Python 2.7 is the minimum version supported,
collections.OrderedDict is guaranteed to exist and there is no need to
reimplement it.

refs #806

Remove useless trailing \
Remove trailing spaces
Add missing empty lines

autopep8 -ir -j2 --select=E301,E302,E502,W291,W293,W391 .

Diff quickly checked.