Lots o formatting
Converted rjs files to js.erb in views/annotations
Missed a comma
Fix tests
David's notes
Merge pull request #1606 from arkon/js-views

Formatting
Get rid of old tests
Merge pull request #1607 from arkon/js-annotation-rjs

Converted rjs files to js.erb in views/annotations
Merge branch 'master' of git://github.com/MarkUsProject/Markus into s3-main