Merge branch 'release/1.4.0' into develop
Remove ordereddict requirement for python 2.6
Update pep8 and pep257
Update version.
Merge branch 'release/1.5.0'