fix bug 934472 - Allow per-template main content area
Work around a character-encoding issue in search.

The problem here is that non-ASCII referers will sometimes behave
properly but sometimes not. Properly fixing this would likely be more
effort than it's worth, as it would involve cleaning up things like
borked "Ã±" sequences in referers.

So this simply slaps a small band-aid on the problem: when URLObject
throws a UnicodeDecodeError, we bail out rather than trying to undo
whatever sequence of multiply-encoded byte mangling turned the referer
into the monster that it is.
Removing unneeded compat-importants
[fix bug 998212] Privacy policy url fixed

The url for the privacy policy has changed from https://www.mozilla.org/privacy/policies/websites/ to https://www.mozilla.org/privacy/websites/

we should update it.
Merge pull request #2308 from swarnava/patch-1

[fix bug 998212] Privacy policy url fixed
Merge pull request #2307 from darkwing/remove-compat-importants

Removing unneeded compat-importants
Combine EditorConfig rules using {...} notation
Merge pull request #2312 from treyhunner/editorconfig-fix

Use shorter EditorConfig file syntax
Merge pull request #2302 from darkwing/main-content-934472

fix bug 934472 - Allow per-template main content area
Migrate mdn-screen rules for in-content elements
Merge pull request #2296 from ubernostrum/search-non-ascii-referer

Work around a character-encoding issue in search.
fix bug 934472 - Use IDs to signify anchor points
Merge pull request #2265 from openjck/migrate-wiki-screen-content-rules

Migrate mdn-screen rules for in-content elements
Remove template not used anywhere
Make i18n for 'callout-firefoxos' link in homepage.html
Update elasticutils to latest version.
Merge pull request #2261 from jezdez/elasticutils-update

Update elasticutils to latest version.
Merge pull request #2317 from darkwing/remove-template

Remove template not used anywhere
Merge pull request #2314 from darkwing/main-content-again

fix bug 934472 - Use IDs to signify anchor points
Try to fix the Travis notifications.