diff --git a/dotfiles/config/.gitignore b/dotfiles/config/.gitignore
index 9a1d4ed3..b6a2d089 100644
--- a/dotfiles/config/.gitignore
+++ b/dotfiles/config/.gitignore
@@ -11,7 +11,7 @@
 /gconf/
 /gedit/
 /gnome-session/
-/google-chrome
+/google-chrome*
 /gtk-3.0/bookmarks
 /hexchat
 /hub
diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index ac388bc2..6474d017 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -1393,6 +1393,13 @@ proced is an top like utility that runs inside of emacs. The following sets auto
 #+BEGIN_SRC emacs-lisp
 (add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p)
 #+END_SRC
+** Use TCP Server
+I've had to stop setting this variable, because it causes problems when emacs is
+not STARTED in daemon mode. For some reason, even when the server is started, it
+is not detected properly by emacsclient by default.
+#+BEGIN_SRC emacs-lisp
+(setq server-use-tcp nil)
+#+END_SRC
 ** Misc
 #+BEGIN_SRC emacs-lisp
 (defvar iedit-toggle-key-default nil)
@@ -1410,9 +1417,6 @@ proced is an top like utility that runs inside of emacs. The following sets auto
 (setq inhibit-startup-message t
       inhibit-startup-echo-area-message t)
 
-;; This makes it so that emacs --daemon puts its files in ~/.emacs.d/server
-(setq server-use-tcp t)
-
 ;; Make buffer names unique.
 (setq uniquify-buffer-name-style 'forward)
 
diff --git a/dotfiles/xmonad/build b/dotfiles/xmonad/build
new file mode 100755
index 00000000..15db2531
--- /dev/null
+++ b/dotfiles/xmonad/build
@@ -0,0 +1,16 @@
+#!/bin/sh -eu
+
+SRC_DIR=~/.xmonad/
+
+EXE_NAME=imalison-xmonad
+
+################################################################################
+# This script will be given a single argument, the path to the
+# executable it should produce.
+output_file=$1; shift
+
+################################################################################
+cd $SRC_DIR
+
+stack build
+mv -u `stack path --dist-dir`/build/$EXE_NAME/$EXE_NAME $output_file
diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index 0b417031..d82a130b 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -601,8 +601,7 @@ myBringNextMaybe =
 
 bindBringAndRaise :: KeyMask -> KeySym -> X () -> Query Bool -> [((KeyMask, KeySym), X ())]
 bindBringAndRaise mask sym start query =
-    [ ((mask, sym),
-       alreadyFocused >>= ifL restoreThisClassOrMinimizeOtherClasses doRaiseNext)
+    [ ((mask, sym), doRaiseNext)
     , ((mask .|. controlMask, sym), myBringNextMaybe start query)
     , ((mask .|. shiftMask, sym), doRaiseNext)
     ]