Added tests around escaping < & >
Changed generateMatches to use replace function to wrap match in

special delimiters to be converted to span tags after running escape
on the full test string to be sure to escape special chars in the non-matching
portion of the string as well. Also added/updated tests for the new test cases.
Updated test for global to use javascript RegExp global method

instead of testing "@expression.option.val() == 'g'" as it failed to recognise
global option when multiple option flags were submitted (eg. 'gi'). Also,
added/updated tests for this new condition.
Merge branch 'master' into fix_for_issue_23

Conflicts:
	application.js
	spec/ResultsSpec.coffee
	spec/ResultsSpec.js
Updated match delimiter to be more unique to avoid errant match highlighting

in the Test Strings.
Merge pull request #28 from judith/fix_for_issue_23

Fix for issue 23 & 6
Merge branch 'master' into gh-pages

* master:
  Updated match delimiter to be more unique to avoid errant match highlighting
  Updated test for global to use javascript RegExp global method
  Changed generateMatches to use replace function to wrap match in
  Added tests around escaping < & >