Re-add ActiveSupport to avoid to_xml problems with our main app's trunk build
Fix Rakefile & gemspec to run trunk specs as well