allow making materials from materials
Minor formatting changes in mcnp.py.
Merge remote-tracking branch 'upstream/staging' into staging
change tab1 tests to reflect new fake data