update ensdf data to close #473
update state map and tests
Merge branch 'crbates-ensdfupdate' into develop
Merge branch 'develop' of github.com:pyne/pyne into develop
collapse_element stub implemented; builds
Test stub implemented; passes nosetest
Identify comps to collapse
Pre-cleanup: passes nosetest
Mostly cleaned up; more testing to to do