Merge branch 'hotfix/readme' into develop
Merge branch 'hotfix/travis.yml' into develop
Fixed Python 2.5 related coding issues. Mostly list, dict, set comprehensions and OrderedDict.
Tests including PEP8 passing in Python 2.6
Merge branch 'release/p26_support'