Merge pull request #218 from tomaka/master

Update for rustc
Fix format and token literal fallout.
Merge pull request #221 from treeman/fmt_fix

Fix format and token literal fallout.