Merge branch 'master' of github.com:flash-square/DW-Vagrant

Signed-off-by: David Guillemin <david.guillemin@gmail.com>
Merge branch 'master' of github.com:flash-square/DW-Vagrant