made links better by returning city and state along with address
Merge remote-tracking branch 'origin/master'