Fix broken twitter reference
Merge branch 'master' into accounts