Updating URL (as per current version of numpydoc.py)
Merge branch 'staging' of https://github.com/pyne/pyne into staging