Updating server settings

Removing incorrect references and adding check for domain with and
without the www.