bug 836529, bug 820913: Switch to django messages framework for redirect notices, remove the redirection parameters from the URL
bug 820913: Disable the redirection message link for now
Basic cleanups to CKEditor config
Modify wiki CSS properties to save 40px height
Merge pull request #1997 from darkwing/some-whitespace-updates

Modify wiki CSS properties to save 40px height
Merge pull request #1991 from darkwing/ckeditor-config-cleanup

Basic cleanups to CKEditor config
fix #1961 - add custom var to track beta testers
Upgrading PrismJS
Bug 859379 - return 404 if document doesnt match revisions. r=groovecoder
Fix bug 949988 - Close button for navigation submenus on Mobile devices
Merge pull request #1951 from lmorchard/836529-redirection-urls

bug 836529, bug 820913: Switch to django messages framework for redirect notices, remove the redirection parameters from the URL
Just a few minor cleanups for the localalizing client to be used in the search tests as well.
Various cleanups (PEP8 and PEP257 related mostly).
Merge pull request #2004 from jezdez/test-cleanups

Cleanups and fixes to the tests.
Actually enable memcache and elasticsearch. That should enable at least the search tests on Travis.
Trying to fix picking up the settings_local module.
Use an own settings module for Travis.
Added forgotten setting.
Merge pull request #2006 from jezdez/travis-enable-services

Actually enable memcache and elasticsearch. That should enable at least the
Merge pull request #1998 from groovecoder/beta-tester-custom-var-1961

fix #1961 - add custom var to track beta testers