add some url
Merge branch 'master' of github.com:simon-rock/emacs_config

Conflicts:
	readme

merge
add cedet, dired function