Add node_modules in wildignore
Merge branch 'master' into macosx