diff --git a/.gitignore b/.gitignore
index 66077286..57cf2ba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,7 @@ dotfiles/sbt/boot/
 dotfiles/.pip/download_cache
 dotfiles/.pip/pip.log
 dotfiles/config/hub
-dotfiles/cider/.cache/
\ No newline at end of file
+dotfiles/cider/.cache/
+dotfiles/pip/download_cache/
+.gitignore
+dotfiles/pip/pip.log
\ No newline at end of file
diff --git a/dotfiles/Xmodmap b/dotfiles/Xmodmap
index 5b7354af..5f97ea5d 100644
--- a/dotfiles/Xmodmap
+++ b/dotfiles/Xmodmap
@@ -1,6 +1,5 @@
-clear Mod1
-clear Mod2
-keycode 63 = Mode_switch
-keycode 66 = Meta_L
-add Mod1 = Meta_L
-add Mod2 = Mode_switch
\ No newline at end of file
+keycode 66 = Control_L
+clear Lock
+add Control = Control_L
+keycode 117 = Caps_Lock
+add Lock = Caps_Lock
\ No newline at end of file
diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 3404f466..4cfc0e42 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 3404f466e205a3f2a1a84562665cac37a227c650
+Subproject commit 4cfc0e42cca13c26ec02bd4beea26c37e02da8e9
diff --git a/dotfiles/lib/shellrc/emacs.sh b/dotfiles/lib/shellrc/emacs.sh
index 73828e17..8fdc2076 100644
--- a/dotfiles/lib/shellrc/emacs.sh
+++ b/dotfiles/lib/shellrc/emacs.sh
@@ -1,4 +1,4 @@
-alias emacs='temacs'
+alias emacs='terminal_emacs'
 is_osx && alias emacs='cocoa_emacs'
 alias terminal_emacs='_emacs -t'
 alias ec='_emacs -n '
diff --git a/dotfiles/lib/shellrc/functions.sh b/dotfiles/lib/shellrc/functions.sh
index ab442f75..1d355706 100644
--- a/dotfiles/lib/shellrc/functions.sh
+++ b/dotfiles/lib/shellrc/functions.sh
@@ -107,10 +107,15 @@ function is_osx() {
     esac
 }
 
-function clipboard() {
+# TODO: Remove this.
+alias clipboard='oscopy'
+
+function oscopy() {
     if is_osx;
     then
         reattach-to-user-namespace pbcopy
+    else
+	xclip -selection c
     fi
 }
 
@@ -118,6 +123,8 @@ function ospaste() {
     if is_osx;
     then
         reattach-to-user-namespace pbpaste
+    else
+	xclip -o 
     fi
 }
 
diff --git a/dotfiles/lib/shellrc/remote_clipboard.sh b/dotfiles/lib/shellrc/remote_clipboard.sh
index 3f2b48e1..5d19d767 100644
--- a/dotfiles/lib/shellrc/remote_clipboard.sh
+++ b/dotfiles/lib/shellrc/remote_clipboard.sh
@@ -36,6 +36,6 @@ function smart_copy() {
     then
         remote_os_copy
     else
-        clipboard
+        oscopy
     fi
 }
diff --git a/resources/requirements.txt b/resources/requirements.txt
index a1d7dfee..70bdb87c 100644
--- a/resources/requirements.txt
+++ b/resources/requirements.txt
@@ -5,7 +5,6 @@ ddg
 ouimeaux
 simplejson
 invoke
-cider
 lxml
 okcupyd
 vcrpy
diff --git a/tasks/__init__.py b/tasks/__init__.py
index 8745659e..8d609c78 100644
--- a/tasks/__init__.py
+++ b/tasks/__init__.py
@@ -23,6 +23,7 @@ def setup(ctx):
         linux.all(ctx)
     dotfiles(ctx, 'f')
     install_python_libraries(ctx)
+    powerline(ctx)
     install_npm_libraries(ctx)
     change_shell(ctx)
 
@@ -34,6 +35,11 @@ def dotfiles(ctx, flags=''):
     return ctx.run('dotfiles -s{1} -R {0}'.format(DOTFILES_DIRECTORY, flags))
 
 
+@ctask
+def powerline(ctx):
+    ctx.run('pip install --user git+git://github.com/Lokaltog/powerline')
+
+
 @ctask
 def install_python_libraries(ctx):
     ctx.run('sudo pip install -r {0}'.format(
@@ -64,3 +70,4 @@ ns.add_task(setup)
 ns.add_task(install_python_libraries)
 ns.add_task(install_npm_libraries)
 ns.add_task(vimstall)
+ns.add_task(powerline)
diff --git a/tasks/linux.py b/tasks/linux.py
index 1cb38d0c..c0e54e1b 100644
--- a/tasks/linux.py
+++ b/tasks/linux.py
@@ -10,7 +10,8 @@ def all(ctx):
 linux_pacakges = ('zsh', 'tmux', 'emacs24-nox', 'nmap', 'scala', 'default-jdk',
                   'default-jre', 'python-virtualenv', 'htop', 'netcat', 'wget',
                   'zlib1g-dev', 'libxml2-dev', 'libxslt1-dev', 'python-dev',
-                  'libncurses5-dev', 'npm', 'python3-dev')
+                  'libncurses5-dev', 'xbindkeys', 'python3-dev', 'xclip',
+                  'silversearcher-ag', 'npm', 'xdotool')
 @ctask
 def apt_get(ctx):
     install_command = 'sudo apt-get -y install'