diff --git a/.gitconfig b/.gitconfig
index 0c86d152..5d8e8fd3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,7 +17,7 @@
 ##   http://kerneltrap.org/mailarchive/git/2007/7/1/250424
 ##   http://stackoverflow.com/questions/1817370/using-ediff-as-git-mergetool
 [mergetool.ediff]
-    cmd = emacs --eval \" (progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (write-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\" 
+    cmd = emacs -q -l ~/.emacs-light --eval \" (progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (write-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\" 
 
 [merge]
 	tool = ediff
diff --git a/.homeinit b/.homeinit
index e4c50cce..445c804c 100755
--- a/.homeinit
+++ b/.homeinit
@@ -14,6 +14,7 @@ if [ -f /bin/em ]; then
     echo "==> Emacs"
     sudo sh -c "echo '#!/bin/sh
 emacsclient -a \"\" -t \"\$@\"' > '/bin/em'; chmod 755 /bin/em"
+    echo
 fi
 
 ## Mutt