Pam/Kira's changes for running in CMSSW_2_1_4
Update gitignore