Goa: Ex-minister Rohan Khaunte joins BJP