From http://wpspeak.com/custom-post-types-to-main-feed/