require 'six' in setup.py, add flask._compat for stuff not yet in 'six'
python-modernize automated changes: misc. minor stuff
python-modernize automated changes: fix_dict
python-modernize automated changes: fix_next
python-modernize automated changes: fix_unicode (but without six.u())
py3 compat: use six.reload_module
Merge branch 'six' of github.com:ThomasWaldmann/flask into ThomasWaldmann-six

Conflicts:
	flask/testsuite/__init__.py
reload_module is in six.moves