Adjust travis to use master now