Added ZestConditionalRegexUnitTest.java & fixed conflicts

Conflicts:
	test/org/mozilla/zest/core/v1/TestPrint.java
	test/org/mozilla/zest/core/v1/ZestAllTestSuite.java
	test/org/mozilla/zest/core/v1/ZestAssertBodyRegexUnitTest.java
	test/org/mozilla/zest/core/v1/ZestExpressionAndUnitTest.java