move some entries around
Merge branch 'master' of github.com:ahupowerdns/newconsensus