merge my repo

mguegan salt-bootstrap -> virtua