update vimrc
Merge branch 'master' of https://github.com/daf-/dotemacs
Merge branch 'master' of https://github.com/daf-/dotemacs
update init.el