Basic Asciidoc support. W00t.
Merge remote-tracking branch 'upstream/master'