Updated jquery to not use noConflict