Merge upstream and update Gemfile.lock

landing.bryanroessler.com/_layouts/page.html

@@ -13,6 +13,12 @@ layout: base
 	        {% include disqus.html %}
         </div>
 	        {% include fb-comment.html %}
+        <div class="staticman-comments">
+          {% include staticman-comments.html %}
+        </div>
+        <div class="justcomments-comments">
+          {% include just_comments.html %}
+        </div>
 	    {% endif %}
     </div>
   </div>