Git credentials
Merge branch 'master' of github.com:aaronlord/vagrant