always rebase on git pull
updated salty-vagrant salt-minion.conf