Adds a conditional to check for missing twitter user
Merge branch 'master' into email-alerts