Update Fork

Update fork rep to current Civcraft/Citadel master state.