Fixes and added some vagrant stuff