Fixes to allow compilation against current version of rust.
Merge pull request #1 from cmh/compile_against_master

Fixes to allow compilation against current version of rust.