Merge pull request #228 from alfredr/master

Bring up to date against current rust
Hack our way around rust-lang/rust#19387
Merge pull request #229 from bjz/fix-build

Hack our way around rust-lang/rust#19387