Vastly simplified confused code.
Updated travis run.