Undid the pre6 bollocks, nice one Matt
Added Donut subtraction to the jet algorithm for the case of 9x9 jets. Along with this added an option in l1tCaloParams_cfi.py that allows you to turn it on and off, off by default
Fixed an unnecessary default option in the create function of the JetAlgorithm class
Merge branch 'l1t-devel-CMSSW_7_1_0_pre2' of github.com:cms-l1t-offline/cmssw into donuttesting-branch-pre2