add ftbs with cubic model
finish up explanation of sympy derivation of flux model and show new results
Merge remote-tracking branch 'refs/remotes/origin/wave_dev' into wave_dev