add option for vagrant ssh timeout
remove uneeded options from vagrant
Merge branch 'extraneous' into integration
merge timeout