Converted rjs files to js.erb in views/annotations
Fix tests
Get rid of old tests
Merge pull request #1607 from arkon/js-annotation-rjs

Converted rjs files to js.erb in views/annotations