Move the vhost stuff in to make this more efficient/harder to screw up.
Don't define here.
Another test to run.
Bump WP version.