Fix the other deprecated doctypes.
Merge pull request #169 from tec27/more_doctypes

Fix the other deprecated doctypes.