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