Switch over to Evan's state layout, make keyserver repo optional.