Major changes to tweet parser

Essentially this is the  first commit that actually works