various changes.
Merge commit '317b7cd'

Conflicts:
	init.el