ignores files that don't end in .js
Merge branch 'master' into integration