security
before try edts
add edTS mode
Merge remote-tracking branch 'origin' into emacs24-acassa

Conflicts:
	.netrc
Merge branch 'emacs24' of github.com:ibnHatab/env-at-picon into emacs24-acassa

Conflicts:
	.zshenv
	.zshrc