add conditional to post.html partial to display post content on home and single views
Fix merge conflict in post_meta.html