Merge pull request #582 from edsu/develop

working annotation test
Merge branch 'develop' of github.com:hypothesis/h into develop
/api/token needs to be defined before /api/*

This wasn't breaking anything too serious. It meant that the frontend
could not auto-fetch new tokens after their TTL expired during
extremely long sessions.
Comments
whitespace
Use gevent worker instead of gevent_wsgi

Fixes X-Forwarded-Proto and SERVER_NAME handling.

Until the next gunicorn update this will cause spurious EBADF lines
that do not break the server.
Remove store reverse_proxy helper.

The Pyramid way is X-Vhm-Root.
Revert "Tweak the tag editor widget to to propagate click events"

This reverts commit a686e540ee3a012cc7dbec50ac5d3f07fc5f75cd.
Restore reload_templates setting
Rework thread collapsing and editing interaction

Thread collapse handling is moved to the thread directive. This
directive no longer creates new scope (since the tranclusion of the
recursion was making it hard to propagate events up the thread
scopes).

Now, which children are being edited is tracked by every ancestor
so that threads cannot be collapsed if editing is taking place
below.

Fix #555
Save edits uncollapsed
Don't propagate tag clicks
Cursor pointer on all threads
whitespace
Add a sleep in functional test for sauce
Fix virtual rooting of the api
Use a static index route

Fix regression in horus redirects in prev commit.

We can generate routes to the index page but still let traversal
handle all the dispatch by making the route static.
Fix old typo and cosmetic change
Fix for #525
For replies it populates the annotation.quote field with the parent's reply.
The userstream.coffee page will use this field if exists.
Fix for #524
 userstream page does not display text for highlights but shows as much as it can from the quote