Merge branch 'master' into wsr_shared

.vim/colors/hjp-dark.vim

@@ -12,7 +12,8 @@ if exists("syntax_on")
 endif
 let g:colors_name = "hjp-dark"
 
-hi Comment    term=bold                      ctermfg=88          ctermbg=White                  guifg=Red
+hi ColorColumn                                                   ctermbg=238
+hi Comment    term=bold                      ctermfg=246         ctermbg=Black                  guifg=Red
 hi Constant   term=underline                 ctermfg=201                                        guifg=Magenta
 hi Error      term=reverse                   ctermfg=15          ctermbg=9                      guifg=White    guibg=Red 
 hi ErrorMsg   term=standout     cterm=NONE   ctermfg=226         ctermbg=DarkRed  gui=NONE      guifg=Yellow   guibg=DarkRed

.vimrc

@@ -1,6 +1,7 @@
 set ai
 " Disable (ab)use of X11 selection
 set clipboard=
+set colorcolumn=72,80,100,132
 set comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,n:\|
 set expandtab
 set exrc

.zshrc

@@ -152,3 +152,10 @@ fi
 # for new style completion:
 autoload -U compinit
 compinit
+
+# NVM
+if [ -d "$HOME/.nvm" ]
+then
+    export NVM_DIR="$HOME/.nvm"
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+fi