Merge pull request #11 from peter-/mergestrat

Implement entity blacklisting, as requested by Olivier on pyff-users