Refactored according to PEP8 and optimized imports
Merge remote-tracking branch 'rohe/master' into maennel_master

Conflicts:
	src/oic/oauth2/__init__.py
Another PEP8 iteration
Merge remote-tracking branch 'rohe/master' into ci_testing

Conflicts:
	oidc_example/rp3/modules/opchoice.mako.py
	src/oic/oic/provider.py
	src/oic/utils/http_util.py
	src/oic/utils/keyio.py
Added travis dependencies and tox config
Added TravisCI badge
Bump for lauunching tests
Merge remote-tracking branch 'rohe/master' into ci_testing

Conflicts:
	setup.py
	src/oic/oauth2/provider.py
	src/oic/oic/provider.py
	src/oic/utils/sdb.py
Adapted tests to focus on content rather than on sort order
Adapted some other tests to compare unordered sets instead of ordered strings
Allow extra claims to be added to the idtoken by Rebecka Gulliksson.
Merge branch 'ci_testing' of https://github.com/maennel/pyoidc into maennel-ci_testing

Conflicts:
	.travis.yml
	README.rst
	setup.py
	src/oic/oic/message.py
	src/oic/oic/provider.py
	src/oic/utils/authn/user.py
	tests/test_oic_provider.py
Removed unnecessary imports.
Minor changes
Merge branch 'maennel-ci_testing'