NBC News: Congress announces a deal to avoid a shutdown, resolving homeland security dispute