New target types using only charme:doctypeScheme.
Merge branch 'Iteration6Fixes' of https://github.com/charmeproject/charme_plugin into Iteration6Fixes