merge upstream
new HTMLReader
include html comments properly in reader
Merge branch 'master' of git://github.com/ametaireau/pelican
git merge master
re-import htmlparser
re-import cgi. properly turn utils.open into a context manager
fix failing test with new open context manager
handle escaped chars in html properly
properly write out charref's
change 'markdown' to HTML in the comments
Merge branch 'master' of git://github.com/ametaireau/pelican
Merge branch 'master' into htmlparser
add documentation for html reader
fix grammar
Updated documentation to reflect addition of new markdown types.
Add asciidoc reader support

http://www.methods.co.nz/asciidoc/index.html

Processes files ending in .asc with asciidoc. Extra arguments can be
passed by using the ASCIIDOC_OPTIONS config setting
Merge pull request #570 from bcl/master-asciidoc

Add asciidoc reader support
Merge pull request #611 from michaelreneer/master

Updated documentation
Strip tags from title in simple index. Fixes #612

This fix was applied previously to the relevant places in both the
"simple" and "notmyidea" themes, but the simple theme's index.html file
was apparently neglected.