Removed template files for non-temperature models (we're not going to be using them for the demo, so they're just more to keep track of). Also refactored out more uses of "data.".