not forwarding local DNS lookup to upstream
added mx record
added dhcp-host to handle hosts with fixed ip served by dhcp
Merge remote-tracking branch 'origin/master'