Merge branch 'master' into dev-readability

Conflicts:
	legibility/settings/base.py
	legibility/urls.py
Merge branch 'develop' into dev-oauth-session
removed login_url from decorators as it is now set in settings/base.py
Commit change from Oauth1 helper to OAuth1Session
small change to isauthorized function to remove extraneous parameter
Added check for whether the logged in user is both authenticated against the Legibility service and authorized against the Readability API
Moved around templates
Small change to home.html template
Merge branch 'develop'
Merge branch 'master' of https://github.com/gidj/Legibility