Merge pull request #68 from sfackler/master

Fixed to work with latest master
Updated to work with newest rust master

Also gitignored generated Makefile.