removed configuration rectrictions, updated tests to include testing of zero-conf
resolved conflict in documentation