Found the bug in acts_as_versioned_jw that caused the annoying deprecation warnings. Fixed it by overriding the offending method in config/application.rb with full explanation in comments.
Renamed all the templates, fixed a couple of minor test failures.
Now getting 13 errors in test:units (all email related apparently) and 26 in test:functionals and 11 in test:integration (various issues).