Lots o formatting
Converted rjs files to js.erb in views/annotations
Avoid looking up parameters already cached in instance variables
Missed a comma
Fixed the tests.
Align lines
Fix tests
Merge pull request #1613 from arkon/results-tests

Fixed Results controller tests
Merge pull request #1608 from ferrous26/tweak

Avoid looking up parameters already cached in instance variables
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