tests are now mocha-patible
fixed makefile, should run on travis
Merge pull request #2 from hallas/master

tests are now mocha-patible