Merge branch 'master' of https://github.com/10up/varying-vagrant-vagrants
Vagrantfile: Whitespace cleanup
Check 'Customfile' relative to Vagrantfile, not the current working directory.
Merge pull request #165 from ocean90/patch-2

Check 'Customfile' relative to Vagrantfile, not the current working directory.
Apply changes from http://core.trac.wordpress.org/changeset/25571 to vvv's copy of wp-tests-config.php
Merge pull request #166 from TobiasBg/master

Apply changes from http://core.trac.wordpress.org/changeset/25571 to vvv's copy of wp-tests-config.php
Merge branch 'master' of https://github.com/simonwheatley/varying-vagrant-vagrants
Merge branch 'master' of https://github.com/10up/varying-vagrant-vagrants