Update Machinist to 3.x
Fixes #11