Fixing issues #16 and #24 

+ reordering of clients.xml (separating real hardware from VMs)