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
allow override page url and save_as values directly from the metadata

this is similar to the template override implemented in #404
add functional test for save_as/url override

and update functional tests output
add docs for save_as/url override from metadata feature
git merge upstream/master
properly write out charref's