fixed derp error on vagrantfile
Merge branch 'production' into staging