Add volume controls
Merge branch 'xf86' into tlvince

Conflicts:
	config.def.h