Tidy up model building from data sources

See https://github.com/strongloop/loopback/issues/560
Merge pull request #301 from strongloop/feature/allow-base-for-discovery

Tidy up model building from data sources