Pulling latest changes to prezto