updated for latest rust nightly. some overly verbose cruft, but all tests pass
Merge pull request #4 from tupshin/master

updated for latest rust nightly. some overly verbose cruft, but all tests pass