Avoid mangling the app prototype scope
Fix slicing of environment overrides and comment
Allow ElasticSearch to be configured via env variables
Merge pull request #1327 from hypothesis/elasticseach-env-config

Allow ElasticSearch to be configured via env variables
Improve error message when run script fails

We now suggest re-running ./bootstrap to troubleshoot the issue.
Temporarily disable functional tests

These have been so unreliable as to be useless. Disabled for now.
Make sure assets are built before js tests
Merge pull request #1328 from hypothesis/run-error-message

Improve error message when run script fails
Isolate static assets in h:static

There are a number of reasons to isolate the static assets into their
own directory.

- An edge case in Pyramid: https://github.com/Pylons/pyramid/pull/1377
- Make serving them with a reverse proxy safer by ensuring that no code
  or configuration lives beneath the static directory
- Cleanliness

To avoid a big move happening shortly after this, also rename some of
the asset subdirectories to close #1317.

- js -> scripts
- css -> stylesheets
- lib -> scripts/vendor
- lib/images -> images
- browser/chrome/js/background.js -> browser/chrome/background.js
- browser/chrome/public/js/destroy.js -> browser/chrome/public/destroy.js

Finally, the locale directory was totally busted. The annotator.po file
included is the defualt locale, and it should have been .pot. Since it
includes only the default strings, there's no reason to serve it. I've
stripped it and we'll reinstate it correctly later.

Close #1311
Move fonts to h:static/fonts

Drop the icomoon directory, saving only selection.json. The rest is not
needed, and is regenerated from the .json by the icomoon app.

Drop the font icon declarations in base.scss and use the css generated
by icomoon.

Move everything to h:static/fonts.

The icomoon css is not in styles because it has "fonts" as a relative
url, and we want "../fonts".
Update MANIFEST.in for static asset move
Update karma.config.js for asset move
Merge pull request #1325 from hypothesis/1311-isolate-static-assets

Isolate static assets in h:static
Revert "Remove dead code (Annotation methods in models.py)"

This reverts commit 7e6f2907c6f8b568f2bd7064cca4fe812e5c0ea7.
Support bundled/debug and unbundled/production

Close #1230
Merge pull request #1322 from hypothesis/1230-chrome-bundled-debug

Support bundled/debug and unbundled/production
Drop the webassets version pin

This is handled by pyramid_webassets. Since moving the assets to
h:static we are compatible with every version of webassets that
pyramid_webassets is.
Remove the .sass-cache folder from extension build
Turn off the webassets cache on extension build
Update `make clean`