add el-get config
Merge branch 'master' of github.com:wenbinye/dot-emacs
fix conflict
update pde