Fix a typo on the Content Architecture page
Made "flake8 ." output less warnings.

Excluded docs/conf.py as its autogenerated by Sphinx and increased
acceptable complexity from 10 to 20.
Separated generation of short_urls from their saving.
include menu pages in broader context. issue #1154
Added William Scales to AUTHORS.
Merge
Merge
Merge
Merge remote-tracking branch 'upstream/master'