more asciidoc->htmlbook rspec tests & a few template updates