Fixed Twitter Stream Error Handling
conflicts
clean up of a few dead things
master merge

Merge branch 'master' of github.com:sociam/indx