fixed bug in gs and updated some style
Changed instances of atoms_per_mol to atoms_per_molecule in Material class
updated mix_by functions so density is updated
added test_multimaterial2 to verify correct density, modified test1
removed extraneous debug statements
added description of the test and asserted against hand calculated values
fixed merge conflict
Merge pull request #327 from scopatz/gs-fix

Fixed bug in gammaspec and updated some style guide fixes.
pep8 fixes
pep8 naughtiness
pep8 naughtiness
Merge pull request #330 from makeclean/staging

Update of material mix_by functions such that density is updated accordingly.
updated pyne for new version of xdress
Fixed build issues and changed more instances of atoms_per_mol to atoms_per_molecule in material classes and classes calling these classes
adding csv files including q_vals for calculating decay heat as well as a start to the python script to read the files
Merge branch 'staging' of https://github.com/pyne/pyne into q_vals

updating pyne
added parsing function to q_val program
Merge branch 'staging' of http://github.com/pyne/pyne into molRename
fixed a typo andchanged two instances in transmute
Adding tested geometry discretization capability.