fixed import issues

everything runs now, need to look at ConstraintTests though (a test is
failing that wasn't failing before)
Merge pull request #351 from mmcmahon13/master

fixed import issues,