Fixup disqus links and message counts

_layouts/post.html

@@ -39,7 +39,7 @@
 
 {% if page.comments %}
     <script type="text/javascript">
-        var disqus_shortname = '{{ page.disqus }}';
+        var disqus_shortname = '{{ site.disqus }}';
 
         (function() {
             var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;

index.html

@@ -7,7 +7,7 @@ layout: default
     <div class="well">
         <h1><a href="{{ site.baseurl}}{{ post.url }}">{{ post.date | date: "%b %-d, %Y" }} - {{ post.title }}</a></h1>
         {% if site.comments == true and post.comments == true and site.disqus != '' %}
-          <p class="author"># Comments</p>
+          <p class="author"><a href="{{ site.baseurl }}{{ post.url }}#disqus_thread">Comments</a></p>
         {% endif %}
         <div class="content">
             {{ post.content }}