Merge pull request #81 from jjacob/master

Committing my changes from August while looking into synchronisation. Also added top pt and jet smearing flag into test config files.
Splitting if statement for jet smearing into two so that the generated even information is not accessed in the case of data.