Replace ConfigParser with configparser
Merge remote-tracking branch 'upstream/master'

Conflicts:
	flask_ini.py
	setup.py
	test_flask_ini.py
Merge branch 'master' into includes