Merge pull request #56 from jjacob/master

Final updates (hopefully!) for processing v10 ntuples.
Changes for data sample names for v10 ntuples in master_2012_cfg.py