Fixed telluric and update_var code
updating datafidelity
Adding merged stuff
Merge branch 'master' of https://github.com/astrofoley/astr596

Conflicts:
	personal/MalloryConlon/Data_fidelity/datafidelity.py