Merge pull request #94 from hypothesis/unbreak-test-system

(Partially) unbreak the test system
Add a missing newline
Deleted some tests that broke the test system itself
Re-enable the (broken) annotator tests