updated zip code validation to allow Canadian zip codes as well
Merge branch 'master' into nbha