changed something in matom.c
makefile edit
Merge branch 'JMdev' into JM
removed py_wind delta in py_wind_sub
called wind_luminosity in py_wind_sub