Vagrant should only use 1GB of memory
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Use the validator hook that actually reports validation errors