Add review_tags, summary, tags to translation json
Making page-buttons static on edit page again

To avoid conflicts with content before or after it.
re-arrange, update, and simplify vagrant doc
Reduce the number of queries for attachment files.

Currently we’re doing 2 queries for each file, while we can easily
fetch the current revision in one query. MySQL will likewise be able to
cache that.
Merge pull request #2557 from mozilla/file-query-count

Reduce the number of queries for attachment files.
Merge pull request #2556 from groovecoder/vagrant-docs-cleanup

re-arrange, update, and simplify vagrant doc
Merge pull request #2524 from Elchi3/translation-json

Add review_tags, summary, tags to translation json
Merge pull request #2553 from stephaniehobson/page-button-fix

Fix problem with save/preview/discard buttons on edit page
Updated requests to 2.3.0 to fix a sync issue with wheel archive.

This is needed as we've rebuilt the wheel archive for the persona-allauth branch already.
Use the latest kuma-lib.
Add switch for enabling or disabling Optimizely

This will allow us to disable the Optimizely include when we are not
actively running experiments.
Merge pull request #2561 from openjck/optimizely-waffle-switch

Add switch for enabling or disabling Optimizely
Restore .errorlist styles
Initial move of the demos app.
Merge pull request #2558 from openjck/restore-errorlist-styles

Restore .errorlist styles
Refactor/rewrite imports, URL reverses and settings due to move of demos app.
Merge pull request #2564 from ubernostrum/move-demos-app

Move demos app
Merge branch 'master' into persona-allauth

Conflicts:
	kuma/demos/feeds.py
	kuma/demos/helpers.py
	kuma/demos/models.py
	kuma/demos/tests/test_views.py
	kuma/users/views.py
Hiding the email field of the signup for when used for social accounts.

Once we're supporting Github we may want to redisplay this if there are multiple verified email addresses returned from Github's user email API.