Resolve host names
auto merge of #887 : brson/servo/master, r=metajack