attempt to resolve ambiguous foreign keys
Merge pull request #4 from jkru/master

reconcile updates
Merge pull request #9 from lzhou89/master

getting new model files?