Add buffer functionality.
Merge branch 'master' into dev.coding

Conflicts:
	config/install.el