added jslint, untracked r.js
merge