Machinist2

I still have two unit tests failing and two functional tests failing.

Help would be appreciated, I can't find why they are failing.

Closes #765 :

Machinist 2 has been released : https://github.com/notahat/machinist

We need to upgrade our version of Machinist (we are now using the 1.0 version).

We have to get rid off sham (see machinist wiki : https://github.com/notahat/machinist/wiki/machinist-2 )

Thank you