Fix scope conflict in Annotator

One unfortunate down-side of CoffeeScript not using the `var` keyword
is that declarations in outer scopes can sometimes have unforeseen
consequences due to conflicts with previously local-only names.
Update Annotator tests

- cleanupAnnotation instead of delete
  Delete used to deal with highlights, now it's cleanupAnnotation
- Add test to ensure default services are loaded
  This obsoletes NullStore
Remove unnecessary => method bindings