Add benchmark test
Use the newer api names
Merge remote-tracking branch 'miekg/faster1'

Conflicts:
	zone.go