Updated travis to test on master