Fix merge conflict
Fix cross-crate visibility
Merge pull request #22 from larsbergstrom/rustup_20140410

Update to current rust.