some e's somehow slipped through and were not converted to np.e
Merge remote-tracking branch 'upstream/staging' into staging

Conflicts:
	pyne/endf.pyx
Merge remote-tracking branch 'upstream/staging' into staging
Merge remote-tracking branch 'upstream/staging' into staging
Merge remote-tracking branch 'upstream/staging' into staging
Merge remote-tracking branch 'upstream/staging' into staging
Can now make meshes with no material library. fixes #382.
added mesh iter alteration for no mats
Merge branch 'staging' of github.com:pyne/pyne into big-mesh
Added ZZZAAA function to nucname
Added back license
Fixed license issue
Fixed spacing issue in cpp_nucname.pxd
Fixed spacing issue in nucname.pyx
Added documentation for new ZZZAAA function to nucname.rst
Removed unnecessary comment from test_nucname.py
Fixed multiplication conversion factor in nucname.cpp
Fixed ZZZAAA tests in test_nucname.py
Added more tests to test_zzzaaa_to_id() in test_nucname.py
potential fix for lib python.