Avoid instances of EntityFactory
Merge branch 'master' of github.com:nfantone/ninja-rabbit