Change zipcode regex to match Canadian postal codes too.