Removed 2.5 from travis
Restore 2.5 support for the time being
Support old and new name for json
Removed incorrect JSON exception subclasses
Merge branch 'master' into sprint-branch