Remove -DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION from setup.py
Merge branch 'master' into data-scorer