Update tax number label
Remove address line 2 - not used any more
Rename address_line1 to street_address
Rename phone to telephone
Rename tax_number to organisation_vat_id
rename city to locality
Rename address_postcode to postal_code
Change level to product_name internally
wording tweak on VAT number
Merge pull request #20 from theodi/feature-label-and-name-changes

Label and name changes
Merge branch 'refs/heads/master' into feature-108-contact-page