Improve/simplify travis build