* use p4merge as diff tool
Merge branch 'master' of github.com:eddyxu/dotfiles