Refactor twitter streaming and update gitignore
fix conflict merges