Merge
Merge branch 'master' of github.com:joshma/astoria
add twitter stub