Update to rust master

Closes #19