headers now merge
fixed bug around nil attributes
oops, hadn't added two_test_servers.rb
cleaned up for 0.9 release