enabled color
updated
Merge branch 'master' of https://github.com/jintonic/dots
used /home/jingliu instead of ~