Add check for vagrant file
Override :dir from the command line
Add test for override chdir
Merge branch 'override-dir'