updated dot-emacs.el
Merge branch 'master' of github.com:shuge/lees_emacs_pkgs

Conflicts:
	dot-emacs.el