Overhaul vagrant and aws salt deploy