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 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.
Fixed bug in prior calculation (using scaled opt_vals instead of unscaled values)
Merge branch 'fix_prior_bug'

* fix_prior_bug:
  Fixed bug in prior calculation (using scaled opt_vals instead of unscaled values)
  Committing a few changes so I can merge to version 2.0