Fix circular import
Merge pull request #172 from edx/will/fix-circular-import

Fix circular import