Fix twitter api differences from legacy api
Merge branch 'master' into production