Update to jquery-ui 1.8.10, fix bad merge on Makefile.