Update pfs.py
Do not serve files views from STATIC_URL (bug 1013865)
Merge pull request #181 from yohanboniface/bug-1013865-staticfiles-fixes

Do not serve files views from STATIC_URL (bug 1013865)
Commit from Mozilla Verbatim by user a.polivanchuk@outlook.com.: 524 of 3289 strings translated (0 fuzzy).
Remove worldcup promo (bug 1038302)
Merge pull request #183 from davidbgk/1038302-remove-worldcup-bis

Remove worldcup promo (bug 1038302)
Removing MIRROR_* settings (bug 1013865)
Merge pull request #182 from yohanboniface/bug-1013865-staticfiles-fixes

Removing MIRROR_* settings (bug 1013865)
Commit from Mozilla Verbatim by user ouesten.: 3289 of 3289 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia
Update recaptcha wording (bug 1047995)

Captcha does not always contain 2 words, thus confusing the user.
Commit from Mozilla Verbatim by user a.polivanchuk@outlook.com.: 532 of 3289 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia
Fix failing tests
Merge pull request #179 from magopian/fix-failing-tests

fix failing tests on jenkins
fix jenkins build
Commit from Mozilla Verbatim by user a.polivanchuk@outlook.com.: 589 of 3289 strings translated (0 fuzzy).
set up travis (bug 1050156)
Bump amo-validator
Merge pull request #188 from magopian/1050156-travis

set up travis (bug 1050156)