Modified some indentation settings
Merge branch 'master' of https://github.com/mizhi/dot-emacs
Merge