Merge branch 'master' into jp/skimming

Conflicts:
	src/ntuple
	src/skim/xs.jl
added jet rms and hlt
Merge branch 'jp/skimming' of github.com:HEP-KBFI/stpol into jp/skimming
submitting until successful
cleanup
parallel mapping