Making tests pass.
Added SAMBA options.
Now uses orderDict for configuration to preserve a sane option order.
Added SAMBA support.