Added vagrant stuff, fixed a few things