Start working on merge policies
Formatting of new policy code
Some more tests about merge policies (such as they are)
Merge pull request #6 from anchor/wip-policies

Basic support for merge policies