Merge "Clean up: Consistently use "$" instead of "$( document ).ready""