Bring custom post types into theme

Remove the base plugin.  Still requires Super-cpt plugin