Fix trailing whitespace

Also replace the global variable in Vagrantfile with a local one.