pep8 stuff
fix string splits
Merge branch 'develop' of https://github.com/pyne/pyne into pepstuff
Merge branch 'develop' of https://github.com/pyne/pyne into pepstuff
Merge branch 'crbates-pepstuff' into develop