diff --git a/.gitconfig b/.gitconfig
index 37d63b4..d9977e7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,8 +14,6 @@
 	excludesfile = /opt/boxen/config/git/gitignore
 [push]
 	default = current
-[credential]
-	helper = /opt/boxen/bin/boxen-git-credential
 [hub]
 	protocol = https
 [gitreview]
diff --git a/.spacemacs b/.spacemacs
index eab2d11..69f16d4 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -201,6 +201,8 @@ before layers configuration."
 
   ;; Don't use the clipboard please
   (setq select-enable-clipboard nil)
+  ;; Don't show the menu bar on the terminal
+  (setq menu-bar-mode nil)
   ;;  ;; Bind to the correct mac keys
   ;;  ;(setq mac-option-modifier 'meta)
   ;;  ;(setq mac-command-modifier 'super)
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
index ba6e140..c5a5145 160000
--- a/.vim/bundle/YouCompleteMe
+++ b/.vim/bundle/YouCompleteMe
@@ -1 +1 @@
-Subproject commit ba6e1408fd2f6929a8e3f4dc527ed1096945fef8
+Subproject commit c5a5145082f34cb4821539c08fb29fad805a4cbf
diff --git a/.vim/bundle/ag b/.vim/bundle/ag
index f05f313..f755abf 160000
--- a/.vim/bundle/ag
+++ b/.vim/bundle/ag
@@ -1 +1 @@
-Subproject commit f05f31352689be245611c893b37652110f27a2c5
+Subproject commit f755abfb1c4e4e3f59f6cfa25ce16edb5af9e516
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
index 30b4ce3..7014a52 160000
--- a/.vim/bundle/syntastic
+++ b/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 30b4ce3411f539f695ab8def7fc69c2f835eb8fe
+Subproject commit 7014a52acefa594d45c40b3eaefee70549bdcaeb
diff --git a/.vim/bundle/vim-markdown b/.vim/bundle/vim-markdown
index 409c37b..ba29415 160000
--- a/.vim/bundle/vim-markdown
+++ b/.vim/bundle/vim-markdown
@@ -1 +1 @@
-Subproject commit 409c37b205afa2f9d590e23de8171482d66770e2
+Subproject commit ba294150d192d40e51d749e30a7079977eb23a0b
diff --git a/.vimrc b/.vimrc
index e39ef00..308dde9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -708,6 +708,9 @@ inoremap <C-z>q <C-o>gq}<C-o>k<C-o>$
 map <F7> :Tfdm<CR>
 "nmap <Leader><F7> :exec "make -C " . expand("%:p:h") . " check"<CR>
 nmap <F8> :make<CR>
+nmap <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
+      \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
+      \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 nmap <Leader><F8> :exec "make -C " . expand("%:p:h")<CR>
 "nmap <F9> :exec "make -C " . expand("%:p:h") . " check SUBDIRS= check_PROGRAMS=" . GetCurrentTest()
 "            \ . " TESTS=" . GetCurrentTest() <CR>
diff --git a/.zshenv b/.zshenv
index b158c31..f9f7194 100644
--- a/.zshenv
+++ b/.zshenv
@@ -7,7 +7,7 @@
 typeset -ga preexec_functions
 typeset -ga precmd_functions
 typeset -ga chpwd_functions
-fpath=($fpath $HOME/.zsh/func)
+fpath=(/usr/local/share/zsh-completions $fpath)
 #typeset -u fpath
 
 # Options
@@ -182,6 +182,7 @@ alias vir=vr
 alias vis=vs
 alias gvim="gvim -font 'APL385 Unicode 8' -c 'set keymap=uniapl385'"
 alias n=nvim
+export NVIM_TUI_ENABLE_TRUE_COLOR=1
 
 ## For forwarding ssh auth I think
 if [ ! -z "$SSH_AUTH_SOCK" -a "$SSH_AUTH_SOCK" != "$HOME/.ssh-agent" ] ; then
@@ -212,21 +213,21 @@ alias lla="ll -Fa"
 alias c="cd"
 cl() { cd $@ && ls }
 #old linux aliases
-alias e="TERM=rxvt-256color emacs -nw"
-alias et="TERM=rxvt-256color emacsclient -t"
+alias e="TERM=xterm-256color emacs -nw"
+alias et="TERM=xterm-256color emacsclient -t"
 #alias ec="emacsclient -c --eval '(set-background-color \"black\")'"
 alias ec="emacsclient -c"
 alias ed="emacs --daemon"
 alias ecx="emacsclient --eval '(make-frame-on-display \"$DISPLAY\")'"
 #alias s="TERM=xterm;ssh serenity.cat.pdx.edu"
-alias s="TERM=rxvt;ssh hunner@destiny.cat.pdx.edu"
-alias f="TERM=rxvt;ssh hunner@firefly.cat.pdx.edu"
-alias z="TERM=rxvt;ssh hunner@zabava.cat.pdx.edu"
-alias o="TERM=rxvt;ssh hunner@osiris.cat.pdx.edu"
-alias m="TERM=rxvt;ssh hunner@mint.cic.pdx.edu"
-alias chandra="TERM=rxvt;ssh hunner@chandra.cs.pdx.edu"
+alias s="TERM=xterm ssh hunner@destiny.cat.pdx.edu"
+alias f="TERM=xterm ssh hunner@firefly.cat.pdx.edu"
+alias z="TERM=xterm ssh hunner@zabava.cat.pdx.edu"
+alias o="TERM=xterm ssh hunner@osiris.cat.pdx.edu"
+alias m="TERM=xterm ssh hunner@mint.cic.pdx.edu"
+alias chandra="TERM=xterm ssh hunner@chandra.cs.pdx.edu"
 export CS=cs.pdx.edu
-alias odin="TERM=xterm;ssh hunner@odin.pdx.edu"
+alias odin="TERM=xterm ssh hunner@odin.pdx.edu"
 alias budda="ssh hunnur@budda.dreamhost.com"
 alias kvar="ssh hunner@131.252.134.134"
 alias kvin="ssh hunner@131.252.135.22"
@@ -399,8 +400,8 @@ ex () {
     fi
 }
 
+eval "$(rbenv init -)"
 [ -f ~/.zsh-fuzzy-match/fuzzy-match.zsh ] && source ~/.zsh-fuzzy-match/fuzzy-match.zsh
-[ -f /opt/boxen/env.sh ] && source /opt/boxen/env.sh
 ## Profiling options
 #unsetopt xtrace
 #exec 2>&3 3>&-