minimal changes to compile with rustc nightly (0.11-pre 33c3edd 2014-05-23).
Merge pull request #1 from lifthrasiir/master

Minimal changes to compile with rustc nightly (0.11-pre 33c3edd 2014-05-23)