Update gitignore
Update Vagrantfile
Merge branch 'master' into development