zip code now working
minor bug fix: location search bar text fixed
Merge remote-tracking branch 'kenneth/master'
Merge with kenneth's location fix