Vagrant setup, first commit
Resolve some conflicts