516 & 294

Hi Peter,

This pull fixes #516 and #294
It simply checks the args and if there's a next arg, it appends them.
The real change is in 
https://github.com/cyclops1982/powerdns/commit/cf0af82bac0343af09b782b68d84a6a9555a75f5

Others commits are just cosmetics.