Adding twitter repo we're grabbing
Fix merge conflicts and add bit about needing to get the oauth creds