Add some lifetime annotations
Merge pull request #4 from brandonw/update-to-latest-rust

Partial update to latest rust