fixed dependencies for Vagrant usage, see https://github.com/composer/composer/issues/2717
Merge branch '4.0' of https://github.com/phundament/app into 4.0