UPdate travis to look at the travis branch to get it configured so we don't have a bunch of silly commits in master.