Strip cabin reference that was left behind from testing
Merge branch 'protocol_improvements_and_server_client_improvements' into driskell_merge_pr164