Fixed makefile. Added thermostat conservation output. Updated readme. Rearranged filenames