Revert to py.test in travis

Stand by for PR