whitespace
Consolidate app and views modules

This distinction was never useful. Initially, I had thought that there
would be a site and an app but now it's clear that the site is an app
and this distinction is unnecessary. The file is not so long that it
shouldn't just be one and it keeps all the controllers together which
might make it easier for newcomers to find things.
Some cleanup after my test refactoring
Add a logout function to the tests

Also use [position()=last()] selector so as not to break if we
ever add multiple signin.
Need to sleep the iframe animation now

There seems to be some kind of regression with the newest selenium
in which switching to the iframe successfully requires sleeping for
the duration of its opening animation.

This is a PITA.
Allow the Annotator test context manager to nest
Correct test for new selenium fixes