Add "module" as predefined globals in jshintrc
Add globals for Jasmine in jshintrc
Resove merge conflicts