Merge pull request #21 from tomaka/master

Update for rustc
Update to latest rust.
Merge pull request #22 from cgaebel/rustup

Update to latest rust.