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...
Merging sboeser/master into local branch before uploading the i3utils.
Merge pull request #5 from sboeser/other_optimizers

Other optimizers branch merged into my master.
Merge branch 'master' of https://github.com/tarlen5/pisa into my current repo.
Merge branch 'other_optimizers'

* other_optimizers:
  Fix output...
  Fix LLH min/max logic, added priors
  Brute force grid-scan analysis with LLH
  Added missing __init__.py
  Setup structure for grid scan
  Revert "Remove unused optimizer (now in separate branch)"
  Revert "Revert "Restructured analysis section""
  Revert "Restructured analysis section"
  Restructured analysis section
  Temp restructure of analysis