Add service names
Merge branch 'master' into udev-keycodes

Conflicts:
	README.rst