Weight windows not mass windows.
Merge pull request #484 from elliottbiondo/staging

Weight windows not mass windows.
Merge branch 'staging' of https://github.com/pyne/pyne into develop
Use and test stripped nucids instead of znum
Minor doc update
Merge branch 'develop' into collapse_el