Update for CMSSW 5.3.18
Refactor python configurations for easier editing
Added quark / gluons discriminator