Merge branch 'master' of git.friedersdorff.com:max/dotfiles

diff --cc emacs/.emacs
index b731c30f1a3def467a7d93bdb0186ae5794280e1,7fd25c7b088c0a82b3783b56e1027efc09340c8c..ae2f6547407915e0426adb90c4e6fea587099265
--- 1/emacs/.emacs
--- 2/emacs/.emacs
+++ b/emacs/.emacs
@@@ -114,7 -114,23 +114,22 @@@
  (use-package evil-magit
    :ensure t)
  
+ (use-package editorconfig
+   :ensure t
+   :init
+   (add-hook 'prog-mode-hook (editorconfig-mode 1))
+   (add-hook 'text-mode-hook (editorconfig-mode 1)))
+ 
+ (use-package js2-mode
+   :ensure t
+   :config
+   (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
+   (setq js2-strict-missing-semi-warning nil))
+ 
+ (use-package yaml-mode
+   :ensure t)
+ 
  
 -(add-hook 'after-init-hook 'global-company-mode)
  (use-package wanderlust
    :ensure t)