Only include Disqus markup if an account has been entered

_includes/disqus.html

@@ -1,6 +1,7 @@
+{% if site.disqus %}
+<div class="comments">
 	<div id="disqus_thread"></div>
 	<script type="text/javascript">
-  {% if site.disqus %}
     
 	    var disqus_shortname = '{{ site.disqus }}'; 
 
@@ -9,6 +10,8 @@
 	        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
 	        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
 	    })();
-  {% endif %}
+
 	</script>
 	<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+</div>
+{% endif %}

_layouts/post.html

@@ -14,7 +14,5 @@ layout: default
     Written on {{ page.date | date: "%B %e, %Y" }}
   </div>
 
-  <div class="comments">
   {% include disqus.html disqus_identifier=page.disqus_identifier %}
-  </div>
 </article>