Added a bunch of fixes
Removec concat, as it isn't needed
Merge branch 'master' of https://github.com/Groupmestats/vagrant