Merge pull request #90 from alexcrichton/next

Track upstream proc_macro changes