Re-add favicon.ico from content.
Put the contents of #content in the main column unless it's an
article-listing or article.
Drop the extra article template-only divs from the content col.
unless we are on an article.