diff --git a/conky/.config/conky/conky.conf b/conky/.config/conky/conky.conf
index 4751cf4..6e8ae9a 100644
--- a/conky/.config/conky/conky.conf
+++ b/conky/.config/conky/conky.conf
@@ -57,5 +57,5 @@ conky.config = {
 }
 
 conky.text = [[
-$loadavg | $mem | ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %H:%M} ${time %m.%d}
+L $loadavg | M $mem | $battery_short | N ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %m/%d} ${time %H:%M}
 ]]
diff --git a/vim/.vim/bundle/SimpylFold b/vim/.vim/bundle/SimpylFold
index 9e7c1c9..aa0371d 160000
--- a/vim/.vim/bundle/SimpylFold
+++ b/vim/.vim/bundle/SimpylFold
@@ -1 +1 @@
-Subproject commit 9e7c1c9d9bd7404dc136c184fcc9680fc36a8ed9
+Subproject commit aa0371d9d708388f3ba385ccc67a7504586a20d9
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
index 88688fe..6437ad6 160000
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 88688fe453038ac1ac26e31646cfbec50fca2fb7
+Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index eee431d..a3fdf1e 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit eee431dbd44111c858c6d33ffd366cae1f17f8b3
+Subproject commit a3fdf1e3c111e011af09d6d5a6b58517ea4fa6d7
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 78c0d21..e1161a7 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 78c0d21a9b0329766732ca2743a848af1c49e791
+Subproject commit e1161a723a353db99780f9a9351340df7abbb106
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
index b56a064..e03afa1 160000
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit b56a064377fcd4340e60ffd9a7fcf157f8a26939
+Subproject commit e03afa1733c6296774ca95ef981bd8fd39bb1151
diff --git a/vim/.vim/bundle/vim-airline-themes b/vim/.vim/bundle/vim-airline-themes
index 6026eb7..5d75d76 160000
--- a/vim/.vim/bundle/vim-airline-themes
+++ b/vim/.vim/bundle/vim-airline-themes
@@ -1 +1 @@
-Subproject commit 6026eb78bf362cb3aa875aff8487f65728d0f7d8
+Subproject commit 5d75d76ca2e17edd68f89ac4f547009d477570c6
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index b754bc2..913fff1 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit b754bc2031f21a532c083dd0d072ba373bbe3a37
+Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5
diff --git a/vim/.vimrc b/vim/.vimrc
index d980f13..a6ad4b7 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -85,11 +85,11 @@ filetype plugin indent on    " required
 " " Put your non-Plugin stuff after this line
 
 "python with virtualenv support
-py << EOF
-import os
-import sys
-if 'VIRTUAL_ENV' in os.environ:
-    project_base_dir = os.environ['VIRTUAL_ENV']
-    activate_this = os.path.join(project_base_dir, 'bin/activate_this.py')
-    execfile(activate_this, dict(__file__=activate_this))
-EOF
+"py << EOF
+"import os
+"import sys
+"if 'VIRTUAL_ENV' in os.environ:
+"    project_base_dir = os.environ['VIRTUAL_ENV']
+"    activate_this = os.path.join(project_base_dir, 'bin/activate_this.py')
+"    execfile(activate_this, dict(__file__=activate_this))
+"EOF
diff --git a/x/.Xresources b/x/.Xresources
index b158330..a00b3c9 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -23,7 +23,7 @@
 *color14: #7E9982
 *color15: #BDBDA4
 URxvt*scrollBar:	false
-URxvt.font:     xft:Terminus:size=12:antialias=true
-URxvt.boldFont: xft:Terminus:bold:size=12:antialias=true
+URxvt.font:     xft:Terminus:size=13:antialias=true
+URxvt.boldFont: xft:Terminus:bold:size=13:antialias=true
 URxvt*transparent: true
 URxvt*shading: 10