Setup restore in a vagrant VM
Use Vagrant Cloud image

That way we can use VMware Fusion or VirtualBox easily
Merge branch 'master' into vagrant