fixing google font URL for https
fixing my fucked up merge...all credit to @christopherleckie on these changes
jesus. pay attention to commas
update tests for new markup