Minor fixes, updated copyright, etc
merged Vagrantfile