Fixing remove and find to use attr

Before it was hardcoded plural which would break for things like
find_classs.  Now it will be find_classes.
Allow extra whitespace almost anywhere

The DHCPd config file is pretty liberal when it comes to whitespace
parsing, so we need to be able to accept whitespace almost anywhere in
our arguments.
Integrating the rt60044 changes
Conditionals working