Removed dhcpopts.conf for now as, it is the routing options and they seem to be dealt with dofferently in the new arrangement
Changed the dhcp tests to avoid handing out the broadcast and gateway addresses :)