Merge branch 'master' of https://github.com/sboeser/pisa
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
TemplateMaker will now write out generated template
Merge branch 'master' of https://github.com/sboeser/pisa into 32_remove_defaults_oscillations

* 'master' of https://github.com/sboeser/pisa:
  TemplateMaker will now write out generated template
Merging sboeser/master into local branch before uploading the i3utils.
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
Fixed bug in prior calculation (using scaled opt_vals instead of unscaled values)
Add seeds to pseudo-data random maps
Fix typo
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