remove zipcode
resolving conflicts
Merge pull request #28 from deuxio/updatedbformap

remove zipcode