Merge pull request #2 from emirotin/master

fix for ender
Linting code, bumping npm version #2
move noConflict to definition part + fix amd definition + fix linting