Upgrade to latest Rust.
Merge pull request #21 from metajack/rustup-20131219

Upgrade to latest Rust.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib.rs