Added a handful of new content types

Sorry -- I again pushed to release-2.2 branch.