Empty vagrant/salt-based setup
Merge remote-tracking branch 'origin/master'