Changed GlobalTag for 2012D data in patData.py and patMC.py

- Also added .gitignore
Fixed bugs introduced during manual merge

- Now should compile!
Fixed bugs introduced during manual merge [2]