Track rust master (enums etc)

With rust-lang/rust#18973 merged, enum variants are now namespaced. This PR contains reexported enums and also incorporates some import fixes.

It was tested against nix-rust with https://github.com/carllerche/nix-rust/pull/21 applied. (current nix-rust master is broken)