Redid redirects.

When I set theses initially, I was under the impression that I wouldn't
use NFSN anymore for my .htaccess. However I'm sticking with that and
www2 subdomain, so I'm re-doing the redirects with that in mind.