-Fixed build break (&str -> str)
-Removed some warnings.
Merge pull request #415 from csherratt/master

Update to latest rustc