John Swinney has toughened up the use of ministerial cars by SNP ministers following a row over Health Secretary Neil Gray being chauffeured to football matches.