Add -k argument to pass to pytest. If -k but no -m, don't add shallow.

Implemented just as -m was implemented.