Made PR changing according to PR suggestions.
pyne namespace, cleanup