They're allegedly including the non-free stuff automatically now, but the better solution is to avoid that hardware whenever possible. Proprietary drivers tend to have more bugs because the public can't fix them, and even if they're supported now, you're at the vendor's mercy for when it stops working regardless of what Debian or Ubuntu includes.