Additional tweaks to @simonwheatley's PR of @westonruter's PR of VVV

I'm messing around as I explore this new auto-site stuff and adding commits as I go. Not ready for merging yet, but possibly part of the discussion. :)