Merge unpro-salt with unpro-vagrant