exclude test stuff from npm
Merge branch 'develop'