Merge.
Keep django version pinned
Ensure correct arguments are used when returning a Page in place of a 404 from a non-page urlpattern
Better error propagation when querying for tweets.
Added --force option to poll_twitter command which will query for tweets on all queries.
Catch and show twitter query errors in management command, and allow continuing.
pep8 fix.
Allow twitter queries to gracefully fail in templates.
Bump requeusts-oauthlib version. Closes #764.
Merge.
Added Ben Ledbury to AUTHORS.
Exempt Link pages from 404 Page replacement
Merge.
Changed 'form' to 'editable_form' to fix naming conflict.  Editable JS no longer being pulled in.
Added Nicole Harris to authors
Don't quote bullets...

The indentation causes the bullets to be treated as blockquotes.
...but do quote quotes :grinning:
Merge.
Merge.
Added David Winterbottom to AUTHORS.