Merge pull request #3 from ebfe/fix-build

Fix build with rust master
Fix more warnings
Fix test build