Update vagrant config.
Merge upstream and fix conflict.
Merge pull request #396 from connormanning/vagrantUpdate

Update vagrant config.
Decimation filter to point context.
Merge branch 'master' of https://github.com/PDAL/PDAL into point-context