Feature/correct template ipaddress

Chris,

Looking to get us off our own cloned branch and onto mainstream.  main fix here is to use the supplied ip address in the template which breaks ninefold if not done.

Regards,
Wazza