format code
for git editor set to emacs -Q
Merge branch 'master' of github.com:zhoujd/zzemacs