Removing the custom-feed short code in favor of using page templates (as per VIP).
Merge branch 'blog-feed-shortcode'