Vagrantfile template changes for Vagrant 1.6
Vagrant 1.6 respects the Vagrantfile template, so there is no need to write out different ones during test - there is still an issue reusing the NetSSH in Vagrant, so tests still don't work, but will sort that one out later