simplify setup, hopefully travis works now