Support removal of "elif"
Use travis-solo instead