Fix roomservice so it adds thing right.

  The way it was wasn't working. The way we use a global github remote
  caused a need to amend the way roomservice was adding devices and
  dependencies to the roomservice.xml.