Update gitconfig and bashrc
Merge branch 'master' of https://github.com/dfq/.df