add vagrant
vagrant config improve
merge
merge
add uploader