diff --git a/06company-yasnippet.el b/06company-yasnippet.el
index fe8c9d4..0044774 100644
--- a/06company-yasnippet.el
+++ b/06company-yasnippet.el
@@ -24,12 +24,12 @@
 (yas-global-mode 1)
 
 (setq-default company-backends '(company-capf ;; Backend for default complete-at-point function
+                                 company-tern ;; Javascript
                                  company-keywords ;; Keyword list for all languages
                                  company-yasnippet ;; Snippets for all programming languages
                                  company-elisp ; Emacs Lisp
                                  company-clang company-cmake ;; C
                                  company-robe ;; Ruby
-                                 company-tern ;; Javascript
                                  company-ansible ;; Ansible
                                  alchemist-company ;; Elixir
                                  company-racer ;; Rust
diff --git a/20web.el b/20web.el
index a104025..c68540a 100644
--- a/20web.el
+++ b/20web.el
@@ -1,5 +1,6 @@
 ;; Use js2-mode for javascript editing
 (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
+(add-to-list 'auto-mode-alist '("\\.json\\'" . js2-mode))
 
 ;; Tern is used for completion
 (add-hook 'js2-mode-hook 'tern-mode)
diff --git a/init.el b/init.el
index a168c71..41fa0f9 100644
--- a/init.el
+++ b/init.el
@@ -79,6 +79,7 @@
                      ;; Text files
                      yaml-mode
                      markdown-mode
+                     gitignore-mode
                      )
       )
 
@@ -114,7 +115,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (indium js2-mode keyfreq company-web visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck racer rust-mode hydra markdown-mode solarized-theme company-ansible alchemist window-purpose column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end web-mode rvm dash-at-point robe base16-theme exec-path-from-shell))))
+    (gitignore-mode js2-mode keyfreq company-web visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck racer rust-mode hydra markdown-mode solarized-theme company-ansible alchemist window-purpose column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end web-mode rvm dash-at-point robe base16-theme exec-path-from-shell))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.