Making address templates uniform and easier to centrally extend.
Fixing format so behat tests pass
Merge pull request #881 from Richtermeister/central-address-template

Making address templates uniform and easier to centrally extend.