updates
merge branch 'master' of https://github.com/tomslee/emacs24-starter-kit-textworkers

Conflicts:
	starter-kit-text.org
updates