Adding in max_tracks parameter that was lost in revert for mcnp.py
Typo in max_tracks section
Forgot to add in the energy in write tracklist
changing a variable read from get_long to get_int
Merge remote-tracking branch 'upstream/staging' into staging
MCNP6 ssr/ssw file does not need notsure2 read
Removing dusty notsure comment line
Merge pull request #269 from kmanalo/staging

Bug Fixes on MCNP SurfSrc Class (niss variable improper assign to long, wrong labels on tracks); more PEP8 on mcnp.py
Added mesh materials to alara function, needs tests
Material mesh to ALARA tests pass.
Fixed alara module function names.
Merge branch 'staging' of github.com:pyne/pyne into alara_mesh
Changed mesh_to_alara to mesh_to_geom.
fixed some test paths