bundle update
switch to underscore templating