Add amazon config in config-template.py
Add amazon support to oauth2.py
Add note regarding https for amazon return_uri
Merge branch 'master' of https://github.com/ghufransyed/authomatic into ghufransyed-master

Conflicts:
	authomatic/providers/oauth2.py
Added the ssl_context kwarg.
Added an outline for Amazon expected values module.
Functional tests now run on https and use liveandletdie>=0.0.3.
Changed from fail() to exit().
Functional tests now run on https and use liveandletdie>=0.0.3.
Changed from fail() to exit().
Added tests for Amazon provider.
Merge branch 'ghufransyed-master'
Added info about Behance OAuth support.
Changed picture to regular expression.
Improved OAuth 2.0 Error Handling. Fixes #72.
Updated CHANGES.
Merge branch 'master' of https://github.com/peterhudec/authomatic

Conflicts:
	tests/functional_tests/test_providers.py