Which daimyo took control of Takamatsu Castle in 1642 and carried out improvements, including rebuilding the castle keep?