修改name,email
Merge branch 'master' of https://github.com/ttchin/dotfiles