Change vagrant machine name
Don't need to forward port on production machine
Work in progress to make deploy consistent for local and production
Tidy up multi-stage cap deploy config