fixed gitignore to pickup gitkeep, added empty gitkeep file
merged fix-vagrant-gitignore changes