Changed flux2.f to handle fwaves and deleted flux2fw.f
Fixed flux2.f to handle use_fwaves==True
Merge pull request #47 from rjleveque/rjl

Fixe flux2.f to make use_fwaves==True work, and remove flux2fw.f