Rename several things for recent rust stdlib changes
Merge pull request #101 from apoelstra/rename-fixes

Rename several things for recent rust stdlib changes