Initial commit.
fixed merging
update test
Merge branch 'master' into dns
I am testing on DNSParser.
In the process, I found a nontrivial problem. Currently, Parsley only supports syntax like:
	rule 'A' :arg1 = blablah
where 'A' stands for a single letter. This means, the payload rule(payload 'CNAME' :arg) is not supported in Parsley.

I will consult tom and dash to find I should now switch to add that parsley syntax or not.