Combine updates to Windows Jekyll stuff