re-add everything that got jumbled in the chaos
Fix the bull, try to make roomservice pull device defaults
Conflicts:
	tools/roomservice.py