Merge branch 'atomicdryad-pr-twitter'