[#112] Update contact-info subelements so they can have text

This fixes the behaviour of telephone and email.

This commit also allows aribtary attributes to be added to website, for
consistency with other elements.