Merge branch 'master' into newmc

diff --cc lib/Plack/App/Gruntmaster/HTML.pm
index 8df45ee4f839113259def81fcadf982c14e813d2,bcd1a887cdb20b2b9a09b27021d83e699e78a81d..daf739baf65aa85e025b60d01dede6492219ac66
--- 1/lib/Plack/App/Gruntmaster/HTML.pm
--- 2/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -83,16 -86,11 +86,16 @@@ sub _render 
        $_->detach for $tree->look_down(static => $args{static} ? 'no' : 'yes');
        $_->attr('static', undef) for $tree->look_down(sub {$_[0]->attr('static')});
        $_->attr('smap', undef) for $tree->look_down(sub {$_[0]->attr('smap')});
-       $tree->as_HTML;
+       $tree->as_HTML(undef, undef, $optional_end_tags);
  }
  
 +my $logo = read_file 'mclogo.svg';
 +$logo =~ y/\n//d;
 +$logo =~ s/(\s+)/ /g;
 +
  sub process_skel {
        my ($tree, %args) = @_;
 +      $tree->fid('logo')->replace_with(HTML::Element::Library::super_literal $logo);
        $tree->content_handler(
                title   =>         $args{title},
                content => literal $args{meat});