More fat trimming and added vagrant stage for cap deployments