wip
wip
Merge pull request #1 from eliotpiering/master

additional checking for async relationships that return promises