Merge pull request #49 from bfops/master

Update for latest rustc
Fix Encodable/Decodable deprecation warnings