Sync with wycats/rust-toml
Bring back in some of my changes, also fixes build on nightly.