A bit of cleanup, updated the README, started vhost test.