Drop rivet2 from configuration.
Merge pull request #778 from ktf/drop-rivet2

Drop rivet2
Merge remote branch 'origin/IB/CMSSW_7_2_X/stable' into IB/CMSSW_7_0_X/stable