Added vagrant folder to gitignore
Added vagrant folder to gitignore
Removed vagrant files
Merged in changes from master