clean up and merge vagrant stuffs