Adding ggZZ samples
Added Z2Jets sample.
Added PAT photons.
Merge branch 'master' of git://github.com/ekfriis/FinalStateAnalysis
Merge branch 'master' of git://github.com/ekfriis/FinalStateAnalysis
Merge branch 'master' of git://github.com/ekfriis/FinalStateAnalysis
Merge branch 'master' of https://github.com/uwcms/FinalStateAnalysis
Merge branch 'master' of https://github.com/uwcms/FinalStateAnalysis
Merge branch 'master' of https://github.com/uwcms/FinalStateAnalysis
Merge branch 'master' of https://github.com/uwcms/FinalStateAnalysis
Fix typo in 16Jan rereco def
Merge branch 'master' of github.com:iross/FinalStateAnalysis into HEAD
Merge branch 'master' of https://github.com/uwcms/FinalStateAnalysis

Conflicts:
	MetaData/python/data8TeV.py
Merge branch 'master' of https://github.com/ekfriis/FinalStateAnalysis
Merge branch 'master' of https://github.com/uwcms/FinalStateAnalysis
Remove electron calibration garbage
Adding new JSON lumimasks
Added 2012C to the datadefs
Commit json_DCSONLY.txt
Commit json_DCSONLY.txt