Merge pull request #2 from sboeser/fixup-flux

Make flux module more consistent
Merge pull request #3 from sboeser/master

Base release (no osc)
Committing a few changes so I can merge to version 2.0
Fixed merge conflicts with 2.0 release
Merge branch 'master' of https://github.com/tarlen5/pisa
Merge branch 'master' of https://github.com/sboeser/pisa
Merging Lukas' mod-reco branch into mine so I can start experimenting with KDE stuff.
Initial implementation of KDE for parameterized resolutions
Merge remote-tracking branch 'tarlen/reco_kde' into mod-reco

Conflicts:
	pisa/analysis/TemplateMaker.py
	pisa/reco/Reco.py
	pisa/reco/RecoServiceKernelFile.py
	pisa/reco/RecoServiceMC.py
	pisa/reco/RecoServiceParam.py