Fixed teaches integration test (or at least a try)
Merge branch 'conversations'
Teaches integration test fix, mini test refactor
Conversations clenaup
Merge branch 'master' into conversations
Fixed conversations mailer