Change from vows to mocha
Merge branch 'refactor'