Unfinished geo modification

Not yet finished incorporating new twitter geo fields. Pushing code back (my new code is commented out) in case you/someone else wants to modify in the mean time. 

Will try to finish update in the next day or so.