add dircolors
update vimrc
Merge branch 'master' of github.com:fanzhang312/vimrc