Merge branch 'master' into wsr

.gitconfig

@@ -22,3 +22,5 @@
 	commit = blue white
 [pull]
 	rebase = false
+[init]
+	defaultBranch = master

.vim/colors/hjp-dark.vim

@@ -22,7 +22,7 @@ hi MatchParen                                                    ctermbg=yellow
 hi Normal                                                                                       guifg=black    guibg=white
 hi PreProc    term=underline                 ctermfg=Magenta     ctermbg=0                      guifg=Purple
 hi Search     term=reverse   cterm=NONE      ctermfg=White       ctermbg=19       gui=NONE      guifg=Black    guibg=Cyan
-hi Special    term=bold                      ctermfg=53          ctermbg=NONE                   guifg=Magenta
+hi Special    term=bold                      ctermfg=Yellow      ctermbg=NONE                   guifg=Magenta
 hi Statement  term=bold                      ctermfg=105                          gui=NONE      guifg=Brown
 hi Underlined term=underline cterm=underline ctermfg=163                          gui=underline guifg=SlateBlue
 

.vimrc

@@ -31,6 +31,7 @@ if $BG == "light"
     syntax on
 elseif $BG == "dark"
     set bg=dark
+    colorscheme hjp-dark
     syntax on
 endif
 

.zshrc

@@ -6,7 +6,6 @@ REPORTTIME=2
 alias	amke=make
 alias	a=alias
 alias	h=history
-alias	j=jobs
 alias	v=vi
 alias	lo=logout
 alias	md=mkdir

GNUmakefile

@@ -9,6 +9,7 @@ ALLSRC = \
 	.gitconfig \
         .psqlrc \
         .vim/colors/hjp.vim \
+        .vim/colors/hjp-dark.vim \
         .vimrc \