Added more robust site detection, new ssh keys