Update templates to use instance vars
Merge branch 'instance_vars_in_templates' into separate_subnets_from_pools

Conflicts:
	templates/dhcpd.conf-header.erb
	templates/dhcpd.pool.erb
Merge branch 'separate_subnets_from_pools' into movealong