diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index a3e008d734c..0fe6f0dc8c8 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -25,13 +25,20 @@ class Plugin::Instance
     @assets = []
     @color_schemes = []
 
-    # Automatically include all ES6 JS files
     if @path
+
+      # Automatically include all ES6 JS files
       dir = File.dirname(@path)
       Dir.glob("#{dir}/assets/javascripts/**/*.js.es6") do |f|
         relative = f.sub("#{dir}/assets/", "")
         register_asset(relative)
       end
+
+      # Automatically include all hbs files
+      Dir.glob("#{dir}/assets/javascripts/**/*.hbs") do |f|
+        relative = f.sub("#{dir}/assets/", "")
+        register_asset(relative)
+      end
     end
 
   end
diff --git a/lib/trust_level.rb b/lib/trust_level.rb
index 6fba142eb3c..a81f5fb3831 100644
--- a/lib/trust_level.rb
+++ b/lib/trust_level.rb
@@ -24,7 +24,7 @@ class TrustLevel
     end
 
     def valid?(level)
-    valid_range === level
+      valid_range === level
     end
 
     def valid_range