Ricotta, Olive & Chorizo and Parmesan & Rosemary Scones