Add -Wno-error=cpp to cython build flags
Merge branch 'master' into data-scorer