pulls client-specific entities out
Merge branch 'master' of github.com:AsheAvenue/Metaphor