Finish taking templates out of constructor + update underscore.js