update gitmodule
Merge branch 'master' of https://github.com/zhongchen/dotfile
update emacs