Merge branch 'master' into 8.0.0

Conflicts:
	lib/sidebar.php

CHANGELOG.md

@@ -23,7 +23,7 @@
 * Remove `Roots_Nav_Walker` as default for all menus
 * Update to Bootstrap 3.3.1
 * Add some base comment styling
-* Make search tearm `required` in search form
+* Make search term `required` in search form
 
 ### 7.0.2: October 24th, 2014
 * Simplify comments, use core comment form and list

lib/sidebar.php

@@ -2,6 +2,8 @@
 
 namespace Roots\Sage\Sidebar;
 
+use Roots\Sage\Wrapper;
+
 /**
  * Determines whether or not to display the sidebar based on an array of conditional tags or page templates.
  *
@@ -44,6 +46,6 @@ class SageSidebar {
   }
 
   private function checkPageTemplate($page_template) {
-    return is_page_template($page_template);
+    return is_page_template($page_template) || Wrapper\SageWrapping::$base . '.php' === $page_template;
   }
 }