That ship was the Shenandoah, but you gave one of two historically acceptable answers, and were thus correct. Yes, Kirby Smith OR the Sherman-Johnson armistice are considered the end... and few historians really consider reconstruction to be a part of the civil war itself, although it was a period of time in which Northern troops occupied the south.
You turn, Malte.