Tweaked code for including custom post types in tag/cat/tax archives to allow override by setting the post_type query var.