Revert "added compatibility fixes for numpy 1.6.2"

This reverts commit 0a7f03857ea9e98236389fa3f2fbb4f48ea67997.
Revert "#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION, to avoid warnings"

This reverts commit 207312c76d4a793baea126f55d0d563bcdfaaee1.
Merge branch 'ghmaster'