Separate the modelBuilder ref from dataSource
Merge pull request #39 from strongloop/model-builder

Separate the modelBuilder ref from dataSource