Updated to Bukkit 1.7.2. Still needs beta testing, but in general, appears to work.