2.07.2:Rylock:56 job_marshal code

* fixed the kshatriya part of the code (which had nothing to do with
female marshals, and didn't really work in the cathar section where it
was placed)
* simplified the other parts, as females with martial traits will always
get one of the three female traits