rm twitter
changes
Merge branch 'master' into mac