fix bug 868430 - tweak the page-edited email
Only show quick-review UI to logged-in users.
fix bug 872016 - strip html from search results
Merge pull request #1075 from groovecoder/page-change-email-tweaks-868430

fix bug 868430 - tweak the page-edited email
Merge pull request #1091 from groovecoder/search-results-strip-html-872016

fix bug 872016 - strip html from search results
Merge pull request #1095 from ubernostrum/mark-as-reviewed-676379

Only show quick-review UI to logged-in users.
bug 873327: Waffle flag to enable/disable deferred wiki rendering via celery
Merge pull request #1097 from lmorchard/873327-waffle-switch-for-deferred-rendering

bug 873327: Waffle flag to enable/disable deferred wiki rendering via celery
fix bug 872660 - Add line numbering to Prism
Merge pull request #1098 from darkwing/prism-line-numbering-872660

fix bug 872660 - Add line numbering to Prism
fix bug 872686 - remove dashboard waffle flags
Fix line number and highlighting collisions
Merge pull request #1099 from darkwing/prism-harmony

Fix line number and highlighting collisions
fix bug 829041: Expose tags & review tags in $json for wiki.getPage in kumascript
Merge pull request #1096 from groovecoder/dashboard-kumawiki-waffle-cleanup-872686

fix bug 872686 - remove dashboard waffle flags
Fix echoing into /etc/hosts will always give permission errors in docs.

This is confusing for people who don't understand how the shell works and how file redirection works. It is better to give a command that can account for needing sudo.
Merge pull request #1101 from mythmon/patch-1

Fix echoing into /etc/hosts will always give permission errors in docs.
Fix comment display within prism blocks
Merge pull request #1100 from lmorchard/829041-tags-in-page-json

fix bug 829041: Expose tags & review tags in $json for wiki.getPage in kumascript
Merge pull request #1102 from darkwing/prism-comments

Fix comment display within prism blocks