added expandtab
Merge branch 'master' of github.com:yyli/dotfiles