upgraded cappistrano
fixes for the vhost setup, change of vhost name and a bit of tidying up