update.
Merge branch 'master' of https://github.com/boyw165/not-release-yet

Conflicts:
	sos/sos.el