Major changes, not finished yet
Merge branch 'master' of https://github.com/erandros/py2html.git