Fixing non-deterministic requires to prevent errors
Merge pull request #47 from daviddavis/temp/20140206083755

Fixing non-deterministic requires to prevent errors
Merge remote-tracking branch 'upstream/master' into cv-master