updated sherpa 2.1.0
drop sherpa dependency for now as blackhat is not compiling with icc
Merge pull request #624 from smuzaffar/IB/CMSSW_7_1_X/devel

sync with stable branch