read_mcnp_inp now returns a dict
Creating a new function for creating ALARA geometry in a mannor that may allow ALARA to run faster.
Merge branch 'mcnp_mats' into alara_mixtures
Merge branch 'mcnp_mat_dict' into alara_mixtures
ALARA geom generation based of record array works will tests passing.
New alara mixture function works but needs more testing.
Add ascii_to_binary function in ace module.
Make sure first argument to struct.unpack is str, not unicode.
Added test_ace.py and ACE file for H-1.
Merge branch 'staging' into ace-conversion

Conflicts:
	pyne/ace.pyx
Resolving merge conflicts.
Tests pass
Cleanup and improved testing
Removed function signature. Line continuation clean-up.
update readme with new conda binaries

moved from my personal repo to the "pyne" org
update conda binaries info
Merge branch 'master' into staging

Conflicts:
	readme.rst
Merge branch 'alara_mixtures' of https://github.com/elliottbiondo/pyne into elliottbiondo-alara_mixtures
added some whitespace
Merge branch 'elliottbiondo-alara_mixtures' into staging