Update Makefile
Update disambiguation.pyx

REmoved import SubsetGrammar as it caused errors during the making and because it seems not to be used.
Merge pull request #42 from tivaro/master

OS X