lots of changes to comp plots

combining males and females and adding Francis weighting stuff thanks to
input from Andre Punt and Chris Francis