removed reference to CINDER
Merge branch 'staging' of github.com:pyne/pyne into staging
Merge remote-tracking branch 'upstream/staging' into staging
changed how filehandles are handled; consolidated test data and functions