created ridiculous twitter integration
twitter
clean branches
Merge branch 'master' into twitter