Merge branch 'active'
use sourcegate's devDependencies just for its tests, there may be a better npm-way...
Merge branch 'master' into active