Rebase
Issue 2035: Admin notification has subject. Cucumber test.
Merge branch 'master' into issue_2035
Cleaning up the mailer a bit
Merge branch 'master' into issue_2035
Update admin mailer and tests
title can be nil before validation! html_safe doesn't work on nil!
Same fix for other models which redefine ```title```
Tumblr link has no html

tumblr link needs no html
Merge pull request #1620 from CristinaRO/fix-title-nil-html_safe

title can be nil before validation! html_safe doesn't work on nil!
Issue 3952: Hopefully kill the last Story
Merge branch 'master' into issue_2035
Merge pull request #1622 from LadyOscar/issue_3952

Issue 3952: Hopefully kill the last Story
Merge pull request #854 from scottsds/issue_2035

Issue 2035:  Admin notification message should have the subject in the c...
2749 Abandoned status for works
2749 Update work fixtures
2749 Commit schema
2749 Commit the schema was a wrong idea
2749 Explicitly set expected work length in tests because there's no JavaScript