Ported mustache updates from Rails app