Testing using only mocha for node v0.8 compat
Merge branch 'develop'