small changed
Updated dot-emacs.el
show line number by default
Merge branch 'master' of github.com:shuge/lees_emacs_pkgs

Conflicts:
	dot-emacs.el