Updated mentions of 'grid' as a configuration option
Added Safari tests back in, with an OS check to skip if running Windows