@@ -53,7 +53,6 @@ (depends-on "mmm-mode") (depends-on "move-text")
 (depends-on "multi-term")
 (depends-on "multiple-cursors")
-(depends-on "mustache-mode")
 (depends-on "nginx-mode")
 (depends-on "org-journal")
 (depends-on "org-plus-contrib")

@@ -675,12 +675,12 @@ (add-to-list 'auto-mode-alist '("xmobarrc\\'" . xmonad-mode)) (add-to-list 'auto-mode-alist '("xmonad.hs\\'" . xmonad-mode))
 
 (req-package nginx-mode
-  :mode (("nginx.conf" . nginx-mode))
+  :defer t
   :config (progn
             (setq nginx-indent-tabs-mode t)))
 
 (req-package lua-mode
-  :mode (("\\.lua\\'" . lua-mode)))
+  :defer t)
 
 (req-package ruby-mode
   :mode (("\\.rb\\'" . ruby-mode)
@@ -1215,11 +1215,6 @@ :defer t   :config (progn
             (setq scss-compile-at-save nil)))
 
-(req-package mustache-mode
-  :mode (("\\.mustache" . mustache-mode)
-         ("\\.mt\\'" . mustache-mode)
-         ("\\.template\\'" . mustache-mode)))
-
 (req-package jinja2-mode
   :mode (("\\.j2\\'" . jinja2-mode)))
 
@@ -1246,7 +1241,7 @@ (add-hook 'web-mode-hook #'emmet-mode)))) 
 (req-package web-mode
   :mode (("/views/.*\\.php\\'" . web-mode)
-         ("/layouts/.*\\.html" . web-mode)
+         ("/layouts/.*\\.html\\'" . web-mode)
          ("/templates/.*\\.php\\'" . web-mode))
   :config (setq web-mode-code-indent-offset 4
                 web-mode-css-indent-offset 4