Update for rustc 0.13.0-nightly

There are still some deprecation errors in the doc tests left
Merge pull request #139 from bjz/update

Update for rustc 0.13.0-nightly