Old, working version of pisa, before trying to upgrade to the current, pip-installable version, that others are currently using
Fixed all merge conflicts
Initial commit with new template.py, checked that reproduced match with PaPA of 12 July 2014.
First implementation of LLR Optimization analysis, with full template chain.
minor change from Sebastian's request
Error checking in PIDService
Add settings file that got good agreement between pisa and papa
Working version of LLR BFGS optimizer based analysis with priors, with 7 systematics.
Fixed capitalization
Fixed typo
Merged Lukas Oscillation Step rewrite into my version.
Fixed some errors in merging, with running llr optimizer analysis.
Added prob3_example.py, a standalone script for doing oscillation calculations.
First version of changes suggested by sboeser
Modifications to structure of code and parameter handling as recommended by sboeser. Also major modifications to .json settings file, and modified oscillations code to allow for oversampling factors of coszen and energy independently.
Fixed imports in Oscillation.py
Latest improvements to structure of LLRAnalysis, etc. mostly having to do with parameter arguments as discussed with sboeser.
Merge branch 'master' into llr_optimizer_initial

* master:
  Fixed imports in Oscillation.py
Fixed missing datetime in Oscillations
Fixed call to AeffServiceMC