Fixes for additional problems found

- Made the header parsing code more intellegent to support constants like (1 << 1)
- For whatever reason, #define NPY_NO_DEPRECATED_API is broken in numpy 1.7.1
  on Mac OS X.  Commenting out for now.