Merge pull request #1 from sheffgeeks/master

updates for pyshef
fix issue 2, and lots of other potential bugs
Merge pull request #14 from ejs/master

Fix issue 2