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
fix bug 872019 - add modified date to search
Merge pull request #1104 from groovecoder/search-results-last-modified-872019

fix bug 872019 - add modified date to search
fix bug 821261 - Add JSON highlighter to Prism
Merge pull request #1103 from darkwing/prism-json-821261

fix bug 821261 - Add JSON highlighter to Prism
fix bug 873717 - Pull tabzilla from CDN
Remove unwanted waffle
Minor base updates
Merge pull request #1105 from darkwing/tabzilla-cdn-873717

fix bug 873717 - Pull tabzilla from CDN
Merge pull request #1106 from darkwing/remove-waffle

Remove unwanted waffle
Merge pull request #1107 from darkwing/base-updates

Minor base updates