Merge branch 'dev-readability'
Merge branch 'develop'

Conflicts:
	legibility/settings/base.py
	legibility/urls.py
Merge branch 'develop'
Merge branch 'master' of https://github.com/gidj/Legibility
Removed settings app
Pulled the navbar into the base and base_loggedin templates
Moved assets around to have one base for the entire site
First stages of the new reader layout