merge sebix's hosts into charringer's hosts

hope I am not doing exactly the opposite...