Ross Morsali Bad merge, updated to include jQuery again