Tidy up model building from data sources

See https://github.com/strongloop/loopback/issues/560