Move vagrant into two sections, one for AWS and one for localdev...remov...

...e breaking env file edis