Tweaked Parser

Now adds hometown from permanent city field.