Fixes for 7TeV PAT tuples
Merge branch '7TeVFixes' of https://github.com/isobelojalvo/FinalStateAnalysis into isobelojalvo-7TeVFixes

Conflicts:
	MetaData/python/data7TeV.py
Merge branch 'isobelojalvo-7TeVFixes' of github.com:ekfriis/FinalStateAnalysis into ekfriis-isobelojalvo-7TeVFixes
Fix trailing whitespace
Merge branch 'ekfriis-isobelojalvo-7TeVFixes' into summer2013