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
Temp restructure of analysis
Restructured analysis section
Revert "Restructured analysis section"

This reverts commit 7cafaa1e6e465dbe743fc9694b0412db139ebb90.
Revert "Revert "Restructured analysis section""

This reverts commit 9f1d62f8cf4f31add5561f82d600dad81e2d456c.
Revert "Remove unused optimizer (now in separate branch)"

This reverts commit 611aca24f7ee140fe9ed98e3f45ee88e6c7c0fd0.
Setup structure for grid scan
Added missing __init__.py
Brute force grid-scan analysis with LLH
Fix LLH min/max logic, added priors
Fix output...
Have all oscillation services constructors report their parameters
Use 'sample' keyword instead of None to signal sampling from atmospheric distributions in NuCraft
Remove default values in all oscillation functions, added all options to Oscillation.py
Added constructor parameters to default settings files