updated config and SCRAM verisons
Merge pull request #631 from smuzaffar/IB/CMSSW_7_0_X/stable

updated config and SCRAM verisons
Merge remote branch 'origin/IB/CMSSW_7_0_X/stable' into IB/CMSSW_7_0_X/stable