Incorporated changes made for jquery.highlight-4.js

Appears some length checks were added for query selection and pattern
Last clause for the ternary operator
Merge branch 'master' into version4

Conflicts:
	highlight.js
Version bump
Merge pull request #3 from dgsmith2/version4

Incorporate changes made for jquery.highlight-4.js (2nd attempt)