Minor code imporovement for taxonomy body class.  Props @garyj.
Issue #22.  Fix for portfolio post type search in the dashboard.  Props @pdme.
Fix merge conflict