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