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
First draft of Aeff docs
Preemptively load logging for any utils and resources module to ease interactive use.
Consistently use -t on cmdline for template settings
Number of trials now has default = 1, so is no longer required.
Finished docs for AeffServicePar
Added symlink in doc directory
Symlink does not work well, moved docs to `doc` directory instead
Merge branch 'docs'

* docs:
  Symlink does not work well, moved docs to `doc` directory instead
  Added symlink in doc directory
  Finished docs for AeffServicePar
  First draft of Aeff docs
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