Poking Holes and Cutting Corners to Achieve Clifford Gates with the Surface Code