Fix companion portraits appearing in Norton's Colma dialogue. Fix combat getting stuck at the end of Colma. Rev version number.