pull upstream update for magic_shell cookbook