added configurations.
Merge branch 'master' of github.com:guozhaohui/dotfiles