Allow role files to supplement motif information.

[pyrrhicPachyderm]

It could be useful if trait information (in the role files) could be provided to supplement the motif roles, instead of only to replace them.

This would have to come with a way to weight the contribution of the motif and trait information against one another. It might even be useful to be able to use a different cost function for each of the two parts.