Issue 3453: Text changes to ToS and FAQ ToS
Removing a space. Fixing indenting
Removing questionmark symbol
Files needed for status page
Note: This has jquery pulled off jqueries pages not for production use
Testing removal of story notes field
Should be a fix to allow all the stories in the sample to import with all their content and with mailto: links stripped.
Merge pull request #1222 from ariana-paris/852_Prospect_fixes

852 prospect fixes
Merge pull request #1221 from CristinaRO/0.9.6-issue-3615-diversity

Diversity statement
3617 Remove Twitter widget
Issue 3166: Update mass import email notification
Issue 3194: Update import mailer for non-archive users
Merge pull request #1226 from scottsds/issue_3166

Issue 3166: Update mass import email notification
Merge pull request #1227 from scottsds/issue_3194

Issue 3194
Merge branch 'master' of github.com:otwcode/otwarchive
Use Nokogiri to grab mailto links to prevent regex from eating work content
fix work gifts & new_recipients updating logic to allow un-gifting
Upgrade Rails to 3.2, upgrade other gems, and remove any replaceable plugins
Updating initializers for Rails upgrade
Updating tests with new Factory Girl syntax
Rails upgrade: updating tag associations and fixing filter tagging cleanup