Merge pull request #84 from jjacob/master

Splitting if statement for jet smearing into two so that the generated e...
Tidying up trigger run numbers.
Modifying test configuration file to run on 7 or 8 TeV nTuples.