Rebase
Issue 2035: Admin notification has subject. Cucumber test.
Issue 3719: Language not visible anywhere
Merge branch 'master' into issue_3719
Making work module consistent
Putting language in the work meta data
Change the code in all the places, Scott. All The Places.
Merge branch 'master' into issue_2035
Cleaning up the mailer a bit
Move colon inside the DT
Added more search index updates to intermittently failing tests.
Create new comments_and_kudos group
Added search index step to intermittently failing collection test involving "Anonymous  Hugs"
Added comments_and_kudos section to Travis file.
Restore the comments tests lost in the move.
Put --trace back in travis config since it didn't reduce verbosity after all.
Merge branch 'master' into issue_2035
Update admin mailer and tests
Revert Iconv encoding to "UTF8" rather than take the risk of changing it without a full regression test.
Issue 3952: Hopefully kill the last Story