Cyberpunk is the gritty near future Blade Runner inspired style of max headroom (which takes place "5 minutes in the future") and the works of William Gibson.
Cypherpunks are the gen x people behind things like PGP and Bitcoin. To quote wikipedia: "A cypherpunk is any individual advocating widespread use of strong cryptography and privacy-enhancing technologies as a route to social and political change."