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
Fixed a broken test
fix minitwit/flaskr test errors, improve docs about file open mode

app.open_resource needs to get called with the correct mode param (python3
will read bytes [not str] if the wrong mode is used), add mode param docs.

rv.data is bytes, fix the data type we compare it with to be also bytes
Merge pull request #742 from ThomasWaldmann/sprint-branch

fix minitwit/flaskr test errors, improve docs about file open mode
fix iterator in testsuite helpers
Merge pull request #743 from ThomasWaldmann/sprint-branch

fix iterator in testsuite helpers
fix metaclass usage for py3
always import from ._compat
Merge pull request #744 from ThomasWaldmann/sprint-branch

2 small fixes for metaclass and import usage
fix data types in after_request test

TODO: why was that bug not causing / displaying an exception somehow?
      should give a TypeError in py 3.3.
Merge pull request #745 from ThomasWaldmann/sprint-branch

fix data types in after_request test
fix typos
Merge pull request #746 from ThomasWaldmann/sprint-branch

fix typos