fixups and add_searchdomains
fix unit test that i broke
Merge pull request #1 from zsprackett/master

fixups and add_searchdomains