Fixing multi machine setup for vagrant
Merge branch 'master' of https://github.com/NextCenturyCorporation/neon