Tidy up model building from data sources

/to @ritch 

The PR allows the correct base/datasource set up for discover/introspect.

See https://github.com/strongloop/loopback/issues/560