Waitrose is making a major play for convenience, stepping into prime Marks & Spencer territory. Should Marks & Spencer be scared, or is it confident of its position?