turn off z k-factor
clean up
add hooks to break up CR by flavor channel
Merge branch 'master' of github.com:bdjackson/PennSUSYFrame