Included metastrategies.prolog in load list

D’oh!
Added unit tests for strategy matching
Refactored default conflict metastrategies

Now phrased as actual defaults.