Make compatible with rust as of 20140212
Fix Makefile
Fix travis
Make travis run tests
Merge pull request #8 from pzol/master

Make compatible with rust as of 20140212