get some twitter stuff working
Merge branch 'add-twitter-stuff'