Rappoccio : Fixing incorrect git push : Adding a Jet-Track Association for PFCHS jets as per BTV POG request

This is to fix the mangled git push from 

https://github.com/cms-sw/cmssw/pull/818

This also fast-forwards the changes from FastSim pre4, and re-adds the corrected JME + btagging sequences.