diff --git a/dotfiles/emacs.d/.gitignore b/dotfiles/emacs.d/.gitignore
index c1a4d98f..e2ef675e 100644
--- a/dotfiles/emacs.d/.gitignore
+++ b/dotfiles/emacs.d/.gitignore
@@ -22,4 +22,6 @@ skewer-cache
 .org-id-locations
 jabber-avatar-cache
 this-machine.el
-recentf
\ No newline at end of file
+recentf
+persp-confs/
+.tern-port
\ No newline at end of file
diff --git a/dotfiles/lib/shellenv/emacs.sh b/dotfiles/lib/shellenv/emacs.sh
index 304c30c7..655b9847 100644
--- a/dotfiles/lib/shellenv/emacs.sh
+++ b/dotfiles/lib/shellenv/emacs.sh
@@ -57,7 +57,7 @@ function focus_emacs {
 }
 
 function emacs_get_running_instances {
-    pgrep emacs | xargs ps -o command -p | egrep -o " --daemon=(.*)" | awk -F= '{print $2}' | sed 's/\^J3,4\^J//'
+    pgrep -i emacs | xargs ps -o command -p | egrep -o " --daemon=(.*)" | awk -F= '{print $2}' | sed 's/\^J3,4\^J//'
 }
 
 function emacs_open {
@@ -66,6 +66,7 @@ function emacs_open {
     fi
     local server_file="$(emacs_get_running_instances | head -n1)"
     emacs_make_frame_if_none_exists $server_file
+    echo "$server_file"
     [ ! -z "$*" ] && emacsclient "$@" --server-file="$server_file"
     focus_emacs
 }
diff --git a/tasks/osx.py b/tasks/osx.py
index 2d4e270c..67f62d92 100644
--- a/tasks/osx.py
+++ b/tasks/osx.py
@@ -28,6 +28,9 @@ def macvim(ctx):
     ctx.run("brew install {0}".format(macvim_install))
     ctx.run("vim +BundleInstall! +q +q")
 
+@ctask
+def setup_dbus(ctx):
+    ctx.run("ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents")
 
 @ctask
 def osx_config(ctx):